Parthiv Patel
6828cb8673
Merge branch 'master-purchase' into 'master'
...
[IMP]: Issues:132 Two Shipments are created for PO with Multi Routing enabled
See merge request flectra-hq/flectra!161
2018-10-29 13:00:13 +00:00
Haresh Chavda
c775f2d078
[IMP]: Issues:132 Two Shipments are created for PO with Multi Routing enabled
2018-10-29 16:06:04 +05:30
Parthiv Patel
aeb9971e41
Merge branch 'master-base-multi-branch' into 'master'
...
[FIX]: Fixed Purchase Order Testcase issue
See merge request flectra-hq/flectra!160
2018-10-29 10:05:21 +00:00
Hansa Rathod
1745ec46ac
[FIX]: Fixed Purchase Order Testcase issue
2018-10-29 14:52:06 +05:30
Parthiv Patel
763e6327f1
Merge branch 'patch-1' into 'master'
...
fix issue with no db name supplied
See merge request flectra-hq/flectra!159
2018-10-27 14:16:51 +00:00
Neha
817b65353e
fix issue with no db name supplied
2018-10-27 14:15:37 +00:00
Parthiv
327f5a88ff
[FIX] text for app store
2018-10-27 15:22:07 +05:30
Parthiv Patel
a6e18e1dfc
Merge branch 'master-backport' into 'master'
...
[ADD] initial backport from v12
See merge request flectra-hq/flectra!153
2018-10-27 09:11:07 +00:00
Parthiv Patel
fbbb803e47
[ADD] initial backport from v12
2018-10-27 09:11:07 +00:00
Parthiv Patel
b1929364fe
Merge branch 'flectra-app-store' into 'master'
...
[IMP] Flectra App Store: User can direct install/download apps from flectraHQ store.
See merge request flectra-hq/flectra!158
2018-10-26 13:09:57 +00:00
Chintan Ambaliya
77b8adfaab
[IMP] Flectra App Store: User can direct install/download apps from flectraHQ store.
2018-10-26 17:48:42 +05:30
Parthiv Patel
02c5ecba43
Merge branch 'master-base-multi-branch' into 'master'
...
[FIX]: Account test case fail issue
See merge request flectra-hq/flectra!157
2018-10-26 09:46:42 +00:00
Hansa Rathod
542bd61eb4
[FIX]: Account test case fail issue
2018-10-26 14:39:28 +05:30
Parthiv Patel
6c04736170
Merge branch 'master-l10n_ae' into 'master'
...
[IMP]: Code optimized and demo data error solved for UAE VAT
See merge request flectra-hq/flectra!156
2018-10-26 08:08:02 +00:00
Haresh Chavda
3eb97d72a9
[IMP]: Code optimized and demo data error solved
2018-10-26 12:49:53 +05:30
Parthiv Patel
920da5880e
Merge branch 'master-l10n_ae_extend' into 'master'
...
[ADD] Unite Arab Emirates (UAE) VAT Implementation
See merge request flectra-hq/flectra!154
2018-10-25 12:42:48 +00:00
Haresh Chavda
ff31a8ff33
[ADD] Unite Arab Emirates (UAE) VAT Implementation
2018-10-25 12:42:48 +00:00
Parthiv Patel
ade1b2467e
Merge branch 'master-digest' into 'master'
...
[ADD]: Digest KPI module
See merge request flectra-hq/flectra!146
2018-10-25 12:37:37 +00:00
Parthiv Patel
610afc6208
Merge branch 'master-base-multi-branch' into 'master'
...
[IMP]: Fixed Branch issue in current Company
See merge request flectra-hq/flectra!155
2018-10-25 11:56:02 +00:00
Haresh Chavda
544dc9cea1
[IMP]: changes in manifest files
2018-10-25 17:25:53 +05:30
Haresh Chavda
e95eb31946
[IMP]: Misc changes, add po files, Solved Flake8 and Pep8
2018-10-25 17:23:50 +05:30
Haresh Chavda
c2fd95a87b
[IMP]: dynamic set domain, field and model for new digest field
2018-10-25 17:23:50 +05:30
Haresh Chavda
84ed2b2571
[ADD]: Add/Remove dynamic digest field, group and misc changes
2018-10-25 17:20:37 +05:30
Haresh Chavda
44e47f76a1
[ADD]: Digest KPI module
2018-10-25 17:20:37 +05:30
Hansa Rathod
cffb46d553
[IMP]: Fixed Brnach issue in current Company
2018-10-25 16:46:20 +05:30
Parthiv Patel
35e76be277
Merge branch 'master-riddhi-abandoned-cart' into 'master'
...
[IMP]Added cron for cart recovery mail and updated default value and configuration
See merge request flectra-hq/flectra!151
2018-10-24 05:16:03 +00:00
riddhikansaraflectra
28bfbb2c2e
[IMP]Added cron for cart recovery mail and updated default value and configuration
2018-10-24 05:16:03 +00:00
Parthiv Patel
89eea9a9d5
Merge branch 'master-multi-branch-hansa' into 'master'
...
[FIX]:Expected singleton, Multiple partners created while creation of a company,…
See merge request flectra-hq/flectra!150
2018-10-18 12:04:51 +00:00
Hansa Rathod
db73e5a9b7
[FIX]:Expected singleton, Multiple partners created while creation of a company, Allowed Companies issue
2018-10-18 14:52:13 +05:30
Parthiv Patel
e28ea84c18
Merge branch 'master' into 'master'
...
[I18N]Improve account french terms
See merge request flectra-hq/flectra!149
2018-10-17 17:29:07 +00:00
Parthiv Patel
4473a201b9
Merge branch 'master-riddhi-flectra-issue' into 'master'
...
[FIX]Issue 107 :Wrong domain in documentation and website url's
See merge request flectra-hq/flectra!147
2018-10-16 10:11:52 +00:00
Riddhi Kansara
5c15e49be7
[FIX]Issue 107 :Wrong domain in documentation and website url's
2018-10-15 15:29:04 +05:30
Parthiv Patel
f6dc66845f
Merge branch 'patch-1' into 'master'
...
Privacy concerns
See merge request flectra-hq/flectra!145
2018-10-15 07:14:22 +00:00
Drew
7b9880f844
Privacy concerns, do not like my name and email address on Google
2018-10-15 04:29:39 +00:00
Didier C
2a9d1e98cc
Update fr.po
2018-10-10 17:06:51 +00:00
Parthiv Patel
e6ce44b6a1
Merge branch 'master-payslip-riddhi' into 'master'
...
[IMP] HR Payroll, round amounts based on currency rounding factor
See merge request flectra-hq/flectra!144
2018-10-08 12:31:57 +00:00
Riddhi Kansara
85ae158ef3
[IMP] HR Payroll, round amounts based on currency rounding factor
2018-10-08 13:24:45 +05:30
Parthiv Patel
a4ccd80351
Merge branch 'master-account-discount' into 'master'
...
[IMP]: issues:104:Incorrect layout for billing orders and divide by zero issues
See merge request flectra-hq/flectra!143
2018-10-04 10:51:20 +00:00
Haresh Chavda
ca04a370e5
[IMP]: issues:104:Incorrect layout for billing orders and divide by zero issues
2018-10-04 15:34:20 +05:30
Parthiv Patel
b3776bf2b0
Merge branch 'master-account-discount' into 'master'
...
[IMP]: Rounding issues for sale/account discount and remove the line in the…
See merge request flectra-hq/flectra!142
2018-09-22 05:37:19 +00:00
Haresh Chavda
7a8c2750ff
[IMP]: Rounding issues for sale/account discount and remove the line in the invoice when the shipment is not create in purchase order line
2018-09-21 18:27:51 +05:30
Parthiv
542a1d33d1
[FIX] version of base module to avoid cron warnings
2018-09-08 15:46:01 +05:30
Parthiv Patel
912137e639
Merge branch 'master-multi-branch' into 'master'
...
[FIX]: Added div block in multi branch
See merge request flectra-hq/flectra!141
2018-09-05 11:29:17 +00:00
Hansa Rathod
e61495519c
[FIX]: Added div block in multi branch
2018-09-05 12:12:37 +05:30
Parthiv Patel
0242ea14b1
Merge branch 'master-issue-105-switch-to-non-language' into 'master'
...
[FIX] Issue #105 switch the user to non language
See merge request flectra-hq/flectra!140
2018-08-30 14:31:49 +00:00
Chintan Ambaliya
325caf822e
[FIX] Issue #105 switch the user to non language
2018-08-30 16:08:58 +05:30
Thomas Winteler
9fc7c5a96b
[IMP] issue template
2018-08-30 08:13:54 +00:00
Parthiv Patel
aff4f04c88
Merge branch 'cherry-pick-a3cf99f0' into 'master'
...
Merge branch '11-translations' into '1.0'
See merge request flectra-hq/flectra!138
2018-08-27 09:25:49 +00:00
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
