Commit Graph

12916 Commits

Author SHA1 Message Date
Laurent Destailleur
6e7c8677eb Update admin.lang 2021-08-17 16:40:31 +02:00
Laurent Destailleur
f18f970b08 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 13:52:36 +02:00
Laurent Destailleur
558c716931 Trans 2021-08-17 05:10:30 +02:00
Laurent Destailleur
f51bcf0038 Debug notification module 2021-08-17 03:20:57 +02:00
Laurent Destailleur
4b89a45ade Trans 2021-08-17 02:16:25 +02:00
Laurent Destailleur
ecb673f15c Debug default BOM on product 2021-08-16 23:02:55 +02:00
Anthony Berton
7d143c5575 Merge branch 'add_option_pdf_global_with_picture' of https://github.com/bb2a/dolibarr into add_option_pdf_global_width_picture 2021-08-12 10:33:55 +02:00
Anthony Berton
fdd85845ce erreur save const 2021-08-12 10:27:19 +02:00
jpb
b1cba14718 merge conflict 2021-08-12 09:36:34 +02:00
Laurent Destailleur
bfedd4a04c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-11 20:47:51 +02:00
Laurent Destailleur
23713d1deb Merge pull request #18328 from lainwir3d/shipment_close_order_on_close
NEW #18326 Workflow: Close order on shipment closing.
2021-08-11 20:47:06 +02:00
Laurent Destailleur
8e9d0a567a Merge pull request #18360 from andreubisquerra/develop
NEW Customer Display with TakePOS
2021-08-11 20:00:36 +02:00
Laurent Destailleur
34b53592b8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2021-08-11 19:44:33 +02:00
Laurent Destailleur
310b5c974b Fix help 2021-08-11 19:43:12 +02:00
Anthony Berton
32e5b531ba Merge branch 'develop' into PDF_show_sender_name 2021-08-11 18:38:30 +02:00
Anthony Berton
956bd00c13 CHANGE_CONST_ADD_DOC 2021-08-11 18:37:13 +02:00
Anthony Berton
652cd3afa5 Merge branch 'develop' into PDF_Option_show_code_client 2021-08-11 18:17:58 +02:00
Anthony Berton
0bab31e973 Merge branch 'develop' into PDF_Propal_frame_option 2021-08-11 18:12:02 +02:00
Anthony Berton
c5e8302ba2 Const 2021-08-11 16:18:16 +02:00
Laurent Destailleur
065d7a781e Merge branch 'develop' into PDF_Add_propal_option_paiment 2021-08-11 15:24:10 +02:00
Anthony Berton
b45a57060f const_and_other_doc 2021-08-11 12:36:16 +02:00
Anthony Berton
3de055bac2 update 2021-08-11 12:10:17 +02:00
Laurent Destailleur
21df418468 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-10 19:28:44 +02:00
Anthony Berton
be016197b4 Trans 2021-08-10 18:07:11 +02:00
Anthony Berton
bcb58ae6ef trans 2021-08-10 18:06:35 +02:00
Anthony Berton
2cb7e828a3 Trans 2021-08-10 18:05:58 +02:00
Anthony Berton
69e31e1655 ok 2021-08-10 18:04:59 +02:00
Anthony Berton
6a41edd3c2 ok 2021-08-10 13:02:37 +02:00
Laurent Destailleur
3b73abed7c css 2021-08-10 11:40:25 +02:00
Anthony Berton
f8df845442 Const and Com 2021-08-10 09:45:15 +02:00
Anthony Berton
3b04c28c4f const 2021-08-10 09:41:40 +02:00
Anthony Berton
284b40f152 CONST 2021-08-10 09:38:07 +02:00
Anthony Berton
0bead55836 ok 2021-08-09 18:11:36 +02:00
Laurent Destailleur
b5b53e382e Fix missing template 2021-08-09 18:01:41 +02:00
Anthony Berton
41457d2adb ok 2021-08-09 17:16:48 +02:00
Laurent Destailleur
591b4c6793 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-09 16:49:16 +02:00
Laurent Destailleur
2de728c074 Fix trans 2021-08-09 16:12:20 +02:00
andreubisquerra
091f5ab23b Customer Display Lang 2021-08-08 19:12:45 +02:00
Laurent Destailleur
c603dfb5ea Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-05 15:16:04 +02:00
Laurent Destailleur
047bbbb298 NEW Can set/unset the usual working day of the week 2021-08-05 14:42:28 +02:00
Laurent Destailleur
5d717113be Add language key 2021-08-05 11:20:43 +02:00
Laurent Destailleur
965bdbb342 Trans 2021-08-04 23:08:57 +02:00
jpb
f99ba2c1e1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_field_in_service_object 2021-08-04 17:26:23 +02:00
Laurent Destailleur
6a31d4657b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-04 13:12:46 +02:00
Laurent Destailleur
bec87f5739 Fix translation ICS 2021-08-04 13:12:07 +02:00
Gauthier PC portable 024
f77b6d87c9 FIX : langs 2021-08-04 09:18:32 +02:00
Laurent Destailleur
ede571dcfe Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
2021-08-03 17:08:49 +02:00
lainwir3d
4873a91afc CLOSE #18326 Workflow: Close order on shipment closing.
Allow an order to be closed automatically when all linked shipment have been closed and all products / items have been shipped.
2021-08-03 17:55:28 +04:00
Laurent Destailleur
d0c57dac34 FIx #18217 - Salary - link 'salary' of bank_url not managed 2021-08-03 15:02:09 +02:00
Laurent Destailleur
0058e32207 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-02 19:03:38 +02:00