Commit Graph

7321 Commits

Author SHA1 Message Date
pascal
b271695b3e update phpdoc 2023-09-28 18:00:17 +02:00
pascal
dbfa676e48 FIX #25230 2023-09-28 17:53:23 +02:00
Laurent Destailleur
b9336c024a Merge pull request #25566 from hansemschnokeloch/rest-extra
Add filter to restrict the data returned
2023-09-27 00:56:51 +02:00
Laurent Destailleur
7846947f0c Fix ref_supplier must be null if not defined 2023-09-26 23:24:14 +02:00
pascal
80f060c771 fix tab indentation 2023-09-26 18:43:25 +02:00
pascal
871f896962 implementation of properties filter 2023-09-26 18:04:48 +02:00
Laurent Destailleur
8cfac1a901 Merge pull request #25976 from frederic34/patch-6
fix line rank in massaction supplier order to supplier invoice
2023-09-25 02:21:14 +02:00
Frédéric FRANCE
058736a944 Update list.php 2023-09-22 08:58:27 +02:00
Laurent Destailleur
68f90319e0 Clean code 2023-09-22 03:24:48 +02:00
Laurent Destailleur
257a961a93 Fix error management 2023-09-22 02:32:23 +02:00
Laurent Destailleur
e9f80875b7 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-22 01:19:49 +02:00
Laurent Destailleur
94f4521f19 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/commande/class/commandestats.class.php
2023-09-21 19:30:02 +02:00
Laurent Destailleur
cd69bd6cba Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-09-21 19:23:24 +02:00
Laurent Destailleur
a8f10304d0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-09-21 19:22:48 +02:00
Laurent Destailleur
c1c7aedd2c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-09-21 19:22:21 +02:00
tnegre
08bb3c1a84 FIX : could not delete a fourn commande row if a commande ligne is linked 2023-09-21 14:20:23 +02:00
Frédéric FRANCE
97c77e611e Update list.php 2023-09-20 11:15:42 +02:00
Frédéric FRANCE
43a3783e79 fix line rank in massaction supplier order to supplier invoice 2023-09-20 09:25:39 +02:00
Laurent Destailleur
579dabb909 Merge pull request #25950 from frederic34/patch-7
fix origin id of order_supplier when creating one invoice_supplier
2023-09-19 23:35:48 +02:00
Laurent Destailleur
69e7f0f1f3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-19 20:07:36 +02:00
Laurent Destailleur
8f002a2310 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-09-19 18:14:27 +02:00
Laurent Destailleur
336927ad70 Fix link to create puchase order from sale order 2023-09-19 18:10:47 +02:00
Laurent Destailleur
39dd702145 Fix warning in option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_SALE_ORDER 2023-09-19 17:59:46 +02:00
Frédéric FRANCE
f1ab8a1268 fix origin id of order_supplier when creating one invoice_supplier for many 2023-09-18 10:14:09 +02:00
Laurent Destailleur
d02c615f40 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-09-16 15:14:22 +02:00
Laurent Destailleur
8d254e341b Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-09-16 14:11:26 +02:00
Laurent Destailleur
773f68ab4f Merge pull request #25849 from solution-libre/feat-add-ORDER_SUPPLIER_SUBMIT-notif
NEW add order supplier submit notif
2023-09-14 12:49:48 +02:00
Noé Courtier
e84c2eeee6 FIX: Missing error message on CommandeFourn creation 2023-09-14 10:57:43 +02:00
VESSILLER
1d54804c88 Fix resolve conflicts 2023-09-13 16:55:14 +02:00
Laurent Destailleur
0c3e516e57 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-13 03:08:46 +02:00
Laurent Destailleur
ec8c2a7d62 Debug dispatch tab 2023-09-13 03:01:18 +02:00
Laurent Destailleur
bf3c0e9d4a FIX Avoid duplicate popup when popup setup to work as ajax 2023-09-12 10:52:15 +02:00
Florent Poinsaut
2443c8edd6 Merge branch 'Dolibarr:develop' into feat-add-ORDER_SUPPLIER_SUBMIT-notif 2023-09-12 10:16:44 +02:00
Florent Poinsaut
84c742a688 add ORDER_SUPPLIER_SUBMIT notif 2023-09-12 10:15:47 +02:00
Laurent Destailleur
d8e3cd2a5f Fix look and feel supplier recuring invoices 2023-09-11 13:50:15 +02:00
Laurent Destailleur
00f5904b66 Close #21912 2023-09-11 12:38:43 +02:00
Laurent Destailleur
91fa48199a Fix warnings 2023-09-10 17:41:22 +02:00
Laurent Destailleur
876a44703d Fix warning 2023-09-10 17:30:00 +02:00
Laurent Destailleur
9ce32c0213 Merge branch
'develop_add_all_id_prof_checker_for_code_compta_customer_and_supplier'
of https://github.com/OPEN-DSI/dolibarr into
OPEN-DSI-develop_add_all_id_prof_checker_for_code_compta_customer_and_supplier
2023-09-09 12:08:41 +02:00
Laurent Destailleur
aab30d7638 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-08 15:33:04 +02:00
Laurent Destailleur
99406caa3a Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-09-08 15:26:21 +02:00
atm-florian
53d43ab50f FIX 17.0 PHP8: supplier invoice class:
- use declared attribute socid instead of fk_soc
- fk_project should be null, not 0 (would break constraint)
2023-09-07 14:47:47 +02:00
Laurent Destailleur
150de687bf Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-05 20:13:38 +02:00
Laurent Destailleur
f43ef55b26 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/modulebuilder/template/class/myobject.class.php
	htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php
	htdocs/modulebuilder/template/core/modules/modMyModule.class.php
	htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
	htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
	htdocs/modulebuilder/template/myobject_agenda.php
	htdocs/modulebuilder/template/myobject_list.php
2023-09-05 19:38:45 +02:00
Laurent Destailleur
e2de78d9b4 Fix permission on recurring invoice 2023-09-05 19:13:51 +02:00
atm-adrien
0c17b266d7 FIX : Can't access to rec supplier invoice card 2023-09-05 16:51:54 +02:00
Laurent Destailleur
7f598794f2 Merge pull request #25747 from mc2contributor/removeDuplicate
Remove duplicate code
2023-08-31 18:52:08 +02:00
Laurent Destailleur
f7300eeaa4 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-31 00:10:26 +02:00
Roger Dueck
3ac1a66e63 Remove duplicate code 2023-08-30 15:05:29 -06:00
Laurent Destailleur
6e7ca61b1f CSS 2023-08-29 21:45:20 +02:00