Commit Graph

11695 Commits

Author SHA1 Message Date
Laurent Destailleur
16e4e736fd Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-10 16:28:29 +01:00
Laurent Destailleur
10d2e0cec0 Fix link to reconcile 2022-02-10 16:27:40 +01:00
Laurent Destailleur
b69beb98b8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-10 13:30:22 +01:00
Laurent Destailleur
c4c15fc105 Fix warnings 2022-02-10 13:16:51 +01:00
Laurent Destailleur
ff3fbd1cf8 Fix preselected field 2022-02-10 13:06:51 +01:00
Laurent Destailleur
21f0264683 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-10 13:02:48 +01:00
Laurent Destailleur
1d6a7ebe03 Fix pb with bulk payment feature 2022-02-10 13:01:47 +01:00
Laurent Destailleur
d69f9eca40 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/pdf.lib.php
2022-02-10 11:25:15 +01:00
Laurent Destailleur
a295725368 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-10 11:23:45 +01:00
Laurent Destailleur
06fe8c391e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/core/lib/pdf.lib.php
	htdocs/install/mysql/tables/llx_propaldet.sql
2022-02-10 10:23:42 +01:00
Regis Houssin
3eabeb2380 FIX broken feature, wrong div name again 2022-02-10 10:18:06 +01:00
Laurent Destailleur
d5d34930a8 Update card.php 2022-02-10 09:58:08 +01:00
Regis Houssin
8dffa020b4 FIX broken feature, wrong div name 2022-02-10 09:54:09 +01:00
Laurent Destailleur
3b18462a62 # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-07 15:51:01 +01:00
Laurent Destailleur
02ec11ff64 css 2022-02-07 15:07:03 +01:00
lvessiller
241a65e2ae NEW add margin info in proposal and order list 2022-02-03 10:39:03 +01:00
Laurent Destailleur
ba77700619 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-02 17:58:09 +01:00
Laurent Destailleur
e813de1595 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-02 14:08:54 +01:00
Laurent Destailleur
5a89da8876 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-02 14:08:19 +01:00
Laurent Destailleur
815dd74de0 Fix missing information propagated to trigger 2022-02-02 14:07:31 +01:00
Laurent Destailleur
b55830d205 Fix missing information propagated to trigger 2022-02-02 14:03:09 +01:00
Laurent Destailleur
44bc197d03 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-01 13:25:45 +01:00
Laurent Destailleur
3a40078149 Fix length of list 2022-01-31 14:03:40 +01:00
Laurent Destailleur
adf8f3886b Merge 2022-01-28 18:07:56 +01:00
Laurent Destailleur
2686541156 Fix late picto 2022-01-28 17:59:58 +01:00
Alexandre SPANGARO
4693b9702b Copyright 2022-01-27 06:20:11 +01:00
Alexandre SPANGARO
1ed096316a Merge branch 'Dolibarr:develop' into fix_vat_report_by_month_and_rate_with_vat_src_code 2022-01-27 06:11:20 +01:00
Alexandre SPANGARO
5f0999665f FIX Invoice - Clone - Don't report contact on an another thirdparty 2022-01-27 02:27:36 +01:00
kamel
db57d1a99f Correction lien pour afficher le detail de la tva si la tva est présente coté client en fournisseur 2022-01-26 15:53:03 +01:00
kamel
83d80cc380 Correction recuperation de la vat_rate_show 2022-01-26 15:45:00 +01:00
Laurent Destailleur
512df3c580 Try to address a better solution for #19776 2022-01-26 15:12:42 +01:00
Laurent Destailleur
1b50350600 Merge pull request #19910 from atm-adrien/NEW_Add_Hooks_salaries_sociales
NEW : Add hooks on salaries and sociales card
2022-01-26 12:58:48 +01:00
Laurent Destailleur
5d176c75db Merge pull request #19780 from aspangaro/16a7
NEW Thirdparty - Add rules customer accountancy code is mandatory to validate invoice
2022-01-25 15:00:47 +01:00
Laurent Destailleur
30811e9b1a Merge branch 'develop' into NEW_Add_Hooks_salaries_sociales 2022-01-25 14:45:51 +01:00
Laurent Destailleur
37338f9a60 Update card.php 2022-01-25 14:03:29 +01:00
Laurent Destailleur
9f377b7fe4 Better responsive on small screen 2022-01-24 23:58:16 +01:00
stickler-ci
6cb97b1346 Fixing style errors. 2022-01-24 15:13:40 +00:00
Adrien Raze
c131bdcbd3 NEW : Add hooks on salaries and sociales card 2022-01-24 16:06:02 +01:00
Laurent Destailleur
0a996f44be Merge pull request #19819 from OPEN-DSI/new-invoice-propagate-extrafields-on-credit-note
NEW pre-filled extra fields with slected credit note
2022-01-23 20:58:45 +01:00
Alexandre SPANGARO
573d45fec8 Merge remote-tracking branch 'upstream/develop' into 15a14 2022-01-21 10:47:27 +01:00
Laurent Destailleur
60b90056c4 Fix #yogosha8450 2022-01-19 15:20:10 +01:00
Laurent Destailleur
91b2d59458 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-14 10:37:41 +01:00
Laurent Destailleur
53e65095a7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/commande/card.php
	htdocs/expedition/card.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/card.php
2022-01-14 10:36:46 +01:00
Laurent Destailleur
9dde80dd52 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/expedition/card.php
	htdocs/fourn/commande/list.php
2022-01-14 10:30:39 +01:00
Alexandre SPANGARO
22e4ea63ea Merge remote-tracking branch 'upstream/develop' into 15a14 2022-01-13 22:30:05 +01:00
Alexandre SPANGARO
6d1f5e1ef1 NEW Add possibility to create contract from invoice 2022-01-13 22:29:48 +01:00
Laurent Destailleur
dbc2631d6a Fix scrutinizer warnings 2022-01-13 19:19:36 +01:00
Laurent Destailleur
b9b45fb506 Fix #hunterf1d1ce3e-ca92-4c7b-b1b8-934e28eaa486
Conflicts:
	test/phpunit/CodingPhpTest.php
2022-01-13 18:46:29 +01:00
Laurent Destailleur
4fe3650736 Fix #hunterf1d1ce3e-ca92-4c7b-b1b8-934e28eaa486 2022-01-13 18:34:15 +01:00
Laurent Destailleur
dbce3cbfbe Clean code 2022-01-13 16:00:39 +01:00