Commit Graph

126 Commits

Author SHA1 Message Date
Laurent Destailleur
d19aca7192 # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-17 20:50:03 +01:00
Alexandre SPANGARO
9349e2df7c FIX Accountancy - Order by accounting account on summary page 2022-02-13 21:11:45 +01:00
Laurent Destailleur
cb45f79ab0 Fix scrutinizer 2022-01-13 20:16:12 +01:00
Laurent Destailleur
d92535ec59 FIX Debug transfert in accountancy for expense report 2021-12-16 15:41:23 +01:00
Laurent Destailleur
582caf0e7a FIX message for automatic binding not clear of what was done or not 2021-12-13 19:04:25 +01:00
Laurent Destailleur
f484fc2710 NEW On the summary of lines to link, can zoom on month. 2021-11-22 05:21:24 +01:00
Laurent Destailleur
2975d47113 FIX Debug a lot of regression in accountancy transfer 2021-11-22 04:13:16 +01:00
Laurent Destailleur
290a6c3d58 Prepare code to allow to filter autolink on month/year 2021-11-22 03:34:50 +01:00
Laurent Destailleur
a1c1999d7d Fix param on link to automatically bind transaction on product account 2021-11-22 03:22:15 +01:00
Laurent Destailleur
67d69e5cd6 Fix autocheck if vat rate seems wrong 2021-11-15 09:14:58 +01:00
Laurent Destailleur
81f2a21954 Merge pull request #18942 from aspangaro/15a25
NEW Accountancy - rewrite bind accountancy code finding on purchase invoice
2021-10-22 22:56:24 +02:00
Frédéric FRANCE
46c4f28478 fix multiple warnings 2021-10-22 22:15:59 +02:00
Alexandre SPANGARO
40a23e4aa4 Update work, thanks Florian 2021-10-22 17:12:44 +02:00
Alexandre SPANGARO
e899d94ed5 NEW Accountancy - rewrite bind accountancy code finding on purchase invoice 2021-10-11 12:50:07 +02:00
Laurent Destailleur
fcffcf3858 Remove useless css 2021-09-10 18:54:42 +02:00
Laurent Destailleur
649c618370 CSS 2021-09-10 17:58:41 +02:00
Laurent Destailleur
75cd63a29b Fix css and missing test 2021-09-10 17:39:58 +02:00
Laurent Destailleur
32da715a6c Fix css and missing test 2021-09-10 17:39:08 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
463fadb776 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/core/class/html.form.class.php
2021-07-08 23:45:26 +02:00
Alexandre SPANGARO
d6be380816 FIX Accountancy - constant ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY 2021-07-08 21:58:54 +02:00
Alexandre SPANGARO
cd215cda17 FIX Accountancy - if we define a date start, automatic binding try to solve old binding 2021-07-08 21:49:53 +02:00
Alexandre SPANGARO
7f0d2b009e FIX SQL Error on automatic binding with functionality "company per entity" activated 2021-06-16 06:23:50 +02:00
Alexandre SPANGARO
cf723d5120 Look a feel v14 CSS Amount 2021-06-13 06:37:44 +02:00
Laurent Destailleur
402d90554a Clean code 2021-06-04 10:04:56 +02:00
Alexandre SPANGARO
d95be3e08b Merge remote-tracking branch 'upstream/develop' into 14a39 2021-04-26 13:53:16 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00
Alexandre SPANGARO
2f31720896 Maxi debug of societe/product per entity 2021-04-14 04:45:17 +02:00
Laurent Destailleur
3744bc6a7a FIX #yogosha5746 - next step (work in progress) 2021-03-30 18:17:13 +02:00
Laurent Destailleur
fb84608586 Clean sql 2021-03-30 03:37:54 +02:00
Laurent Destailleur
46972ec669 FIx #5660 2021-03-18 14:34:44 +01:00
Frédéric FRANCE
337689d5d2 code syntax 2021-02-22 21:36:42 +01:00
Alexandre SPANGARO
13f985d280 NEW: Accountancy - Introduce "Level3" - Define account directly in thirdparty 2020-12-04 04:13:42 +01:00
Laurent Destailleur
7dd69a2b2b Fix escape 2020-09-19 20:11:04 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-07 08:18:17 +00:00
Alexandre SPANGARO
498431fa6f NEW Add a start date to begin binding in accountancy 2020-08-17 15:27:05 +02:00
Laurent Destailleur
7d3039d41f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/user/card.php
2020-06-06 23:04:55 +02:00
Laurent Destailleur
cbafbe16a2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/supplier/index.php
	htdocs/admin/mails_templates.php
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formticket.class.php
	htdocs/langs/en_US/admin.lang
2020-06-06 23:00:24 +02:00
Alexandre SPANGARO
e5f8f38fbf FIX: Accountancy - Binding index - Add a filter on sql request for module Subtotal & Jalon 2020-06-05 17:24:59 +02:00
Frédéric FRANCE
b41ac00b98 add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
43dcd9beb5 add new rule 2020-05-21 00:02:33 +02:00
Alexandre SPANGARO
6982997de5 Fix error 2020-03-01 05:09:57 +01:00
Alexandre SPANGARO
d9b9913e8a NEW: Accountancy - Add mode intra & export for product or service bought 2020-03-01 04:52:12 +01:00
Laurent Destailleur
c87fdc96ce Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/accountancy/supplier/index.php
2020-01-28 17:51:32 +01:00
Laurent Destailleur
782be2ac37 FIX Invert isSellerInEEC and isBuyerInEEC 2020-01-28 17:50:08 +01:00
Laurent Destailleur
bffdc63ec6 FIX The "automatic bind" was linked EEC to export accountancy code
Conflicts:
	htdocs/accountancy/supplier/index.php
2020-01-28 17:48:34 +01:00
Laurent Destailleur
e9de1e16e8 FIX The "automatic bind" was linked EEC to export accountancy code 2020-01-28 17:44:05 +01:00
Laurent Destailleur
fdf4d86d81 Debug code 2019-12-16 12:38:51 +01:00
Scrutinizer Auto-Fixer
8a527631a0 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:02 +00:00
Frédéric FRANCE
35751a80ab 100% centpercent 2019-11-05 21:24:41 +01:00