Parthiv Patel
15fd45aa5a
Merge branch '11-translations' into '1.0'
...
FIX: load translations for web correctly
See merge request flectra-hq/flectra!137
(cherry picked from commit a3cf99f0a3b1099907282bca6ebcd1c83a162406)
eeef2fb7 FIX: load translations for web correctly
2018-08-27 06:21:31 +00:00
Parthiv Patel
b9a01e453a
Merge branch 'master-gst' into 'master'
...
[IMP] Remove GST details from invoice reports.
See merge request flectra-hq/flectra!136
2018-08-22 10:32:41 +00:00
Haresh Chavda
67e133b56b
[IMP]: Default address design for invoice report and web
2018-08-22 12:24:53 +05:30
Haresh Chavda
d0486ef121
[IMP]: changed address design for invoice report and misc
2018-08-21 16:04:29 +05:30
Parthiv Patel
1eebad8df6
Merge branch 'master-stock-ageing-bhumika' into 'master'
...
[IMP]: Updated stock ageing report
See merge request flectra-hq/flectra!134
2018-08-21 07:55:43 +00:00
Bhumika Trivedi
ec9f101624
[IMP]: Updated stock ageing report
2018-08-21 12:24:37 +05:30
Parthiv
82089dc1d3
Merge branch 'hareshchavda/flectra-master-multi-branch'
2018-08-15 09:40:37 +05:30
Haresh Chavda
77a7f4aa24
[FIX]: Branch: Record rule, set branch in warehouse when create company, set branch in defualt company and misc
2018-08-10 14:35:39 +05:30
Parthiv Patel
c6d66a08d9
Merge branch 'master-helpdesk-bhumika' into 'master'
...
[FIX]: Fix issue for login user helpdesk issue creation
See merge request flectra-hq/flectra!131
2018-08-09 09:53:09 +00:00
Parthiv Patel
d2d959f597
Merge branch 'master-pos' into 'master'
...
[FIX]: POS: Remove field and Attrs.
See merge request flectra-hq/flectra!132
2018-08-09 08:56:34 +00:00
Bhumika Trivedi
9eb59fa8a1
[FIX]: Fix issue for login user helpdesk issue creation
2018-08-09 13:40:27 +05:30
Haresh Chavda
ca15ffb3ed
[FIX]: POS: Remove field and Attrs.
2018-08-09 13:39:50 +05:30
Parthiv Patel
700ea4819e
Merge branch 'master-helpdesk-bhumika' into 'master'
...
[FIX]: Fix issue for portal helpdesk issue access
See merge request flectra-hq/flectra!130
2018-08-09 07:44:46 +00:00
Bhumika Trivedi
1e3b803384
[IMP]: Updated record rule
2018-08-09 11:43:58 +05:30
Bhumika Trivedi
9a9666c157
[FIX]: Fix issue for portal helpdesk issue access
2018-08-09 11:04:29 +05:30
Parthiv Patel
4fe671203b
Merge branch 'master-helpdesk-bhumika' into 'master'
...
[FIX]: Fix issue for user name updation on change of partner in ticket
See merge request flectra-hq/flectra!128
2018-08-08 06:12:20 +00:00
Bhumika Trivedi
edd83d63fc
[FIX]: Fix issue for user name updation on change of partner in ticket
2018-08-08 11:05:51 +05:30
Parthiv Patel
ed24f4624c
Merge branch 'master-recurring-fatemi' into 'master'
...
[IMP]:Changed error msg and updated Recurring Source
See merge request flectra-hq/flectra!127
2018-08-07 09:05:56 +00:00
Fatemi Lokhandwala
7ab2f52cce
[IMP]:Changed error msg and updated Recurring Source
2018-08-07 12:50:12 +05:30
Parthiv
8205ef2346
[REL] Flectra v1.4 Lucifer
2018-08-06 22:46:00 +05:30
Parthiv Patel
9a217698d5
Merge branch 'master-helpdesk-bhumika' into 'master'
...
[ADD]: Added modules Helpdesk, Helpdesk Project Ext., Helpdesk Forum and Website Helpdesk
See merge request flectra-hq/flectra!126
2018-08-06 14:00:37 +00:00
Bhumika Trivedi
77db61b89a
[IMP]: Updated review changes
2018-08-06 18:17:29 +05:30
Bhumika Trivedi
0560884373
[ADD]: Added modules Helpdesk, Helpdesk Project Ext., Helpdesk Forum and Website Helpdesk
2018-08-06 17:11:42 +05:30
Parthiv Patel
61bfc2a2d3
Merge branch 'master-recurring-fatemi' into 'master'
...
[ADD]:Added recurring,recurring_sale,recurring_purchase,recurring_account
See merge request flectra-hq/flectra!125
2018-08-06 05:24:35 +00:00
Fatemi Lokhandwala
5ae63c52b6
[ADD]:Added recurring,recurring_sale,recurring_purchase,recurring_account
2018-08-03 16:50:13 +05:30
Parthiv Patel
5289377d4d
Merge branch 'master-account-asset-fiscal' into 'master'
...
[ADD] Account Asset Feature
See merge request flectra-hq/flectra!119
2018-08-02 11:37:56 +00:00
Parthiv Patel
77c0015485
Merge branch 'master-theme-issue-multi-website' into 'master'
...
[FIX] Theme Issue in Multi Website
See merge request flectra-hq/flectra!123
2018-08-02 10:22:28 +00:00
Parthiv Patel
1a32467888
Merge branch 'master-odoo-word-to-flectra' into 'master'
...
[FIX] Odoo word to Flectra
See merge request flectra-hq/flectra!124
2018-08-02 10:22:10 +00:00
Haresh Chavda
18983b54a6
[IMP] Chaneg dependency, .pot file, screenshot, last line posted in sell and Depreciation Summary Report
2018-08-02 14:49:29 +05:30
Chintan Ambaliya
4a8a08ec6c
[FIX] Odoo word to Flectra
2018-08-02 14:33:52 +05:30
Chintan Ambaliya
22428ad180
[FIX] Theme Issue in Multi Website
2018-08-02 13:17:25 +05:30
Haresh Chavda
f113b10d44
[REM] Remove scrap functionality
2018-07-31 15:58:39 +05:30
Haresh Chavda
57de0cd91d
[IMP] Change aseet type view, Sale wizard calculation and screenshot
2018-07-28 12:56:48 +05:30
Parthiv Patel
35931f4f7d
Merge branch 'master-issues-79-compatible-mozila' into 'master'
...
[FIX] Issues #79 compatible CTRL+P with firefox browser
See merge request flectra-hq/flectra!120
2018-07-27 06:46:37 +00:00
Chintan Ambaliya
d37fcb3fa4
[FIX] Issues #79 compatible CTRL+P with firefox browser
2018-07-26 18:24:51 +05:30
Haresh Chavda
9f0bc3ca6d
[ADD] index file and misc changes
2018-07-25 15:25:19 +05:30
Haresh Chavda
1b2971d5b8
[ADD] Add Fiscal year concept and Asset report and misc
2018-07-24 16:45:11 +05:30
Parthiv Patel
488bb3d8e6
Merge branch 'master-gst' into 'master'
...
[IMP] Gst Summary report changes
See merge request flectra-hq/flectra!117
2018-07-23 13:27:36 +00:00
Parthiv Patel
77d8e41d59
Merge branch 'master-advance-pricelist' into 'master'
...
[FIX] issues [87]:Invalid State Code and [88]:Sale Advance Pricelist Installation Error
See merge request flectra-hq/flectra!115
2018-07-23 12:25:55 +00:00
Parthiv Patel
b3063ab3e1
Merge branch 'master-stock' into 'master'
...
[IMP] Issus#99 : The requested operation cannot be completed due to security restrictions
See merge request flectra-hq/flectra!116
2018-07-23 12:25:49 +00:00
Haresh Chavda
ab9747ed2a
[IMP] Gst Summary report changes
2018-07-23 17:52:19 +05:30
Parthiv
48803ecd0e
[ADD] patch till 3528e804de50f0112315e23b65066ff752a3f7b2
2018-07-23 17:44:20 +05:30
Parthiv
973d6f5003
[ADD] upstream patching till 88ff6beb016702cbda710aa31bbf10d51ab68fab
2018-07-23 14:16:49 +05:30
Parthiv Patel
efb6c34f02
Merge branch 'master-riddhi-05072018' into 'master-patch-july-2018'
...
[REM]remove application true from l10n_in_gst module
See merge request flectra-hq/flectra!113
2018-07-23 07:22:08 +00:00
Riddhi Kansara
6b19bd4c10
[REM]remove application true from l10n_in_gst module
2018-07-23 10:24:24 +05:30
Parthiv Patel
a36d3972d1
Merge branch 'master-riddhi-05072018' into 'master-patch-july-2018'
...
[REM]Remove application true from l10n_in_gst, l10n_sg_gst and account_cash_flow module
See merge request flectra-hq/flectra!112
2018-07-20 08:54:22 +00:00
Riddhi Kansara
4dfb8ea83f
[REM]Remove application true from l10n_in_gst, l10n_sg_gst and account_cash_flow module
2018-07-20 13:26:53 +05:30
Parthiv Patel
f2e1110720
Merge branch 'master-patch-july-2018' into 'master-patch-july-2018'
...
Master patch july 2018
See merge request flectra-hq/flectra!111
2018-07-19 14:21:56 +00:00
Harsh
7ef5c42fe4
Master patch july 2018
2018-07-19 14:21:56 +00:00
Parthiv Patel
de63417863
Merge branch 'master-rutuba-09072018' into 'master-patch-july-2018'
...
Master rutuba 09072018
See merge request flectra-hq/flectra!109
2018-07-19 13:23:27 +00:00
