Commit Graph

103391 Commits

Author SHA1 Message Date
Gauthier PC portable 024
da52b00aef fix br 2021-10-07 14:32:16 +02:00
Gauthier PC portable 024
0a73b28742 FIX : travis 2021-10-07 14:18:03 +02:00
Gauthier PC portable 024
3740ae90f1 Merge branch 'NEW/integration_GPEC_code' of github.com:atm-gauthier/dolibarr into NEW/integration_GPEC_code 2021-10-07 13:19:33 +02:00
Gauthier PC portable 024
12488f4a29 FIX : travis 2021-10-07 13:19:21 +02:00
stickler-ci
5e02548abb Fixing style errors. 2021-10-07 10:30:32 +00:00
Gauthier PC portable 024
92319464d8 FIX : travis 2021-10-07 12:27:52 +02:00
Gauthier PC portable 024
de48c1bdde Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/integration_GPEC_code 2021-10-07 11:23:37 +02:00
Laurent Destailleur
2cb0edb5eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/public/project/suggestbooth.php
	htdocs/public/project/suggestconference.php
2021-10-07 11:01:53 +02:00
Laurent Destailleur
9b5909300e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/paiement/card.php
	htdocs/fourn/facture/card.php
2021-10-07 11:00:00 +02:00
Laurent Destailleur
efd44b0ec0 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-10-07 10:57:03 +02:00
Laurent Destailleur
5910d10021 Add hidden option to allow to fix corrupted situations 2021-10-07 10:43:50 +02:00
Laurent Destailleur
162d5d8a39 Fix protection of double party accounting when using situation invoices 2021-10-07 10:38:10 +02:00
Laurent Destailleur
f8d4e2bbf9 Fix phpcs 2021-10-07 04:14:38 +02:00
Laurent Destailleur
ed6fefc493 Trans 2021-10-07 04:10:39 +02:00
Laurent Destailleur
ec545f8967 Fix data 2021-10-07 02:58:51 +02:00
Laurent Destailleur
5463a02887 Debug v14 2021-10-06 21:59:10 +02:00
Laurent Destailleur
6cb690e678 Debug v14 2021-10-06 21:56:48 +02:00
Laurent Destailleur
8fe37b20c0 Debug v14 2021-10-06 21:54:04 +02:00
Laurent Destailleur
cc0b709ad5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-06 21:47:59 +02:00
Laurent Destailleur
2a5e654544 Debug v14 2021-10-06 21:47:46 +02:00
Laurent Destailleur
b34279da89 Debug v14 2021-10-06 21:46:01 +02:00
Laurent Destailleur
f95b0c3033 Debug 2021-10-06 21:43:30 +02:00
Laurent Destailleur
9cf46eaf25 Fix stats graphs 2021-10-06 20:29:48 +02:00
Laurent Destailleur
34187d53f6 Fix missing invoice in stats when due date is unknown/null 2021-10-06 20:10:36 +02:00
Laurent Destailleur
e1f5a39f48 Fix phpcs 2021-10-06 19:40:18 +02:00
Laurent Destailleur
e004d39ed4 Fix status of supplier invoice 2021-10-06 19:30:37 +02:00
Laurent Destailleur
ab78930476 Add api to post supplier proposal and supplier order documents 2021-10-06 18:50:29 +02:00
Laurent Destailleur
e228f07877 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/mrp/lib/mrp_mo.lib.php
2021-10-06 18:41:51 +02:00
Laurent Destailleur
88a482c615 Fix phpcs 2021-10-06 18:40:32 +02:00
Laurent Destailleur
144de734ce Fix phpcs 2021-10-06 18:39:16 +02:00
Laurent Destailleur
520a4f55f8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2021-10-06 18:34:03 +02:00
Laurent Destailleur
96b617cb4d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/eventorganization/conferenceorboothattendee_card.php
	htdocs/mrp/mo_list.php
2021-10-06 18:30:26 +02:00
Gauthier PC portable 024
231f809106 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/integration_GPEC_code 2021-10-06 17:55:36 +02:00
Gauthier PC portable 024
0d5f06743f Merge branch 'NEW/integration_GPEC_code' of github.com:atm-gauthier/dolibarr into NEW/integration_GPEC_code 2021-10-06 17:48:06 +02:00
Gauthier PC portable 024
2efea59614 FIX : db escape 2021-10-06 17:47:27 +02:00
Laurent Destailleur
1c53035e38 Doc 2021-10-06 16:19:36 +02:00
Laurent Destailleur
e71ba444c9 Merge pull request #18518 from henrynopo/patch-10
Add - Shipment lines showing Unit for Qty from order lines
2021-10-06 16:13:31 +02:00
Laurent Destailleur
cb84eef6dc Update shipment.php 2021-10-06 16:13:02 +02:00
Laurent Destailleur
4208964153 Merge branch 'develop' into patch-10 2021-10-06 16:09:54 +02:00
Laurent Destailleur
e3032ef1c4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/fourn/facture/card.php
2021-10-06 16:06:25 +02:00
stickler-ci
528e4f87d1 Fixing style errors. 2021-10-06 13:59:03 +00:00
Gauthier PC portable 024
a271bb8316 Merge branch 'NEW/integration_GPEC_code' of github.com:atm-gauthier/dolibarr into NEW/integration_GPEC_code 2021-10-06 15:56:11 +02:00
Gauthier PC portable 024
ad2844d2f0 FIX : cast int 2021-10-06 15:55:59 +02:00
Laurent Destailleur
ad1cb443e4 Merge pull request #18520 from cfoellmann/PR/pdf-no-template
allow supplier order to not generate pdfs
2021-10-06 15:35:08 +02:00
stickler-ci
fd7b8ae01a Fixing style errors. 2021-10-06 13:34:00 +00:00
Laurent Destailleur
7e0ec949c0 Merge pull request #18915 from vincentjdc/vat-number-societe-list
NEW Add `SOCIETE_SHOW_VAT_IN_LIST` to display VAT number in combo list of thirdparties
2021-10-06 15:33:46 +02:00
Laurent Destailleur
a33ca7d528 Update admin.lang 2021-10-06 15:33:06 +02:00
Gauthier PC portable 024
2f329bf053 FIX : cast int 2021-10-06 15:31:32 +02:00
Laurent Destailleur
eba377cdf0 Merge pull request #18860 from FHenry/12_fix_selectline_from_supplier_order_to_supplier_invoice
fix: Supplier order => Supplier Invoice : line selector (checkbox) wasn't working
2021-10-06 15:31:14 +02:00
Laurent Destailleur
10f0434116 Update card.php 2021-10-06 15:30:19 +02:00