lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
94,637 Commits 43 Branches 150 Tags 886 MiB
abc94a397a
Commit Graph

94637 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre SPANGARO
abc94a397a FIX #18389 Accountancy - Bug on LDcompta10 export for supplier invoice 2021-08-15 11:12:14 +02:00
Laurent Destailleur
0cf2164260 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-08-11 21:15:30 +02:00
Laurent Destailleur
dd70d68b4c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-08-11 21:06:42 +02:00
Laurent Destailleur
eba55d0cf2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
 2021-08-11 21:06:33 +02:00
Laurent Destailleur
dad251493a
Merge pull request #18355 from marc-dll/12.0_FIX_holiday_card_hooks 
FIX: holiday card: hooks uninitialized
 2021-08-11 19:58:50 +02:00
Laurent Destailleur
ab8f78f29a
Merge pull request #18366 from atm-quentin/FIX_11_postgre_select_filter_extrafield 
FIX compatibility postgre sql
 2021-08-11 15:45:04 +02:00
Laurent Destailleur
8da328b183
Update extrafields_list_search_sql.tpl.php 2021-08-11 15:44:48 +02:00
Laurent Destailleur
3964bd28db
Merge pull request #18385 from marc-dll/12.0_FIX_workflow_shipment_validate_trigger 
FIX: shipping validation workflow: 'ORDER_CLOSE' trigger called from wrong object
 2021-08-11 15:28:12 +02:00
Laurent Destailleur
e637a1e59a
Merge pull request #18392 from atm-gauthier/FIX_fetch_lines_cmd_fourn_with_same_supplier_price 
FIX : on supplier order, JOIN with product fourn price table must be …
 2021-08-11 15:16:33 +02:00
Gauthier PC portable 024
087e269103 FIX : on supplier order, JOIN with product fourn price table must be done with fk_soc too to avoid display several times a same line (because of same supplier product ref) 2021-08-10 17:34:47 +02:00
Marc de Lima Lucio
b610cc1c6c FIX: shipping validation workflow: 'ORDER_CLOSE' trigger called from wrong object 2021-08-10 11:18:25 +02:00
Quentin VIAL-GOUTEYRON
108a5ff7cb FIX postgre filter select search extrafield 2021-08-09 15:14:25 +02:00
Marc de Lima Lucio
864a8b4b3e FIX: holiday card: hooks uninitialized 2021-08-06 16:22:19 +02:00
Laurent Destailleur
d822421e10 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/accountancy/tpl/export_journal.tpl.php
	htdocs/projet/tasks/time.php
 2021-08-02 18:31:26 +02:00
Laurent Destailleur
b725dd0309
Merge pull request #18186 from frederic34/patch-8 
fix variable
 2021-08-01 23:46:42 +02:00
Laurent Destailleur
a983dc7506
Merge pull request #18214 from FHenry/12_fix_css_form_confirmlist 
fix: since commit be62c2f7 selectlist from formconfirm were behind form confirm
 2021-08-01 14:53:08 +02:00
Laurent Destailleur
b77ec22590
Merge pull request #18278 from aspangaro/12p17 
FIX: Invoice - Missing button to reopen an abandoned situation invoice
 2021-07-31 12:19:26 +02:00
Laurent Destailleur
f4ed3941a7
Merge pull request #18287 from atm-maxime/12.0 
Fix right check on thirdparty set on ticket card
 2021-07-30 15:11:27 +02:00
Maxime Kohlhaas
12b2ba64eb Fix right check on thirdparty set on ticket card 2021-07-29 17:49:37 +02:00
Alexandre SPANGARO
262dd1600b FIX: Invoice - Missing button to reopen an abandoned situation invoice 2021-07-29 06:23:12 +02:00
Laurent Destailleur
03ac579b64
Merge pull request #18241 from FHenry/fix_numbertotext_ndf 
fix: expense report line, on update qty must/can be decimal
 2021-07-28 19:31:16 +02:00
Laurent Destailleur
20217806c6
Merge pull request #18227 from Hystepik/develop_v13#1 
Fix #18185 : Filter fk_stcomm fixed
 2021-07-28 19:11:04 +02:00
Laurent Destailleur
c9a46ab0cc
Merge pull request #18273 from aspangaro/12p17 
FIX: Accountancy - Debug Export Sage50 / CIEL Compta / CIEL Compta Evo (Format XIMPORT)
 2021-07-28 18:55:47 +02:00
Laurent Destailleur
bd731d9213
Merge pull request #18226 from FHenry/fix_addtimespend 
FIX: cannot add time spend when column ref is not displayed
 2021-07-28 17:38:04 +02:00
Alexandre SPANGARO
cd63ede35a Correctif date 2021-07-28 16:46:57 +02:00
Laurent Destailleur
97e829c7de
Merge pull request #18262 from aspangaro/12p17 
FIX: Accountancy - Debug Export Sage50 / CIEL Compta / CIEL Compta Evo (Format XIMPORT)
 2021-07-28 15:27:58 +02:00
Alexandre SPANGARO
7acebd28ca Add information 2021-07-28 14:08:53 +02:00
Alexandre SPANGARO
712f0b897d FIX: Accountancy - Debug Export Sage50 / CIEL Compta / CIEL Compta Evo (Format XIMPORT) 2021-07-28 12:02:45 +02:00
Laurent Destailleur
e8061df976
Merge pull request #18257 from frederic34/patch-13 
remove debug
 2021-07-28 11:11:03 +02:00
Frédéric FRANCE
42252abc07
remove debug 2021-07-28 10:14:57 +02:00
Florian HENRY
a7f55f4778 fix: Expense report line, on update qty can be decimal 2021-07-26 15:43:57 +02:00
lmarcouiller
b5dde982d5 Fix #18185 : for v13 2021-07-26 10:32:51 +02:00
Florian HENRY
a7cef1aa15 FIX: cannot add time spend when column ref is not displayed 2021-07-26 10:20:11 +02:00
Florian HENRY
e93a362a0d fix: since be62c2f7 commit selectlist from formconfirm were behind the form confirm 2021-07-23 18:33:18 +02:00
Frédéric FRANCE
922354f366
Update projects.php 2021-07-20 18:19:27 +02:00
Laurent Destailleur
34c31492cf
Merge pull request #18161 from FHenry/13_fix_barecode_externaluser 
fix: print barcode sould not be available for external user #18160
 2021-07-16 12:38:32 +02:00
Laurent Destailleur
98b2d4c16e
Merge pull request #18158 from ATM-Consulting/FIX_13.0_inconsistent_triggers_in_reception_line_class 
FIX 13.0: class CommandeFournisseurDispatch triggers
 2021-07-16 12:38:03 +02:00
Florian HENRY
c928de89c6 fix: print barcode sould not be available for external user 2021-07-16 10:41:06 +02:00
Florian Mortgat
180527d23a FIX 13.0: class CommandeFournisseurDispatch provides trigger for UPDATE but not for CREATE / DELETE 2021-07-16 10:10:57 +02:00
Laurent Destailleur
a3526a2649 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/actions_addupdatedelete.inc.php
 2021-07-14 14:46:05 +02:00
Laurent Destailleur
a773652c04 Fix phpcs 2021-07-14 14:37:07 +02:00
Laurent Destailleur
7281a51eff
Merge pull request #18148 from AlexisLaurier/fix/CommonObjectShowInputFieldCheckboxAndRadio 
fix showInputField checkbox and radio type
 2021-07-14 13:55:53 +02:00
Laurent Destailleur
90fa36b46a
Merge pull request #18145 from atm-gauthier/12.0_fix_method_exists 
FIX : method_exists needs object at first param
 2021-07-14 13:52:03 +02:00
Alexis LAURIER
cd5e1d603e fix showInputField checkbox and radio type 2021-07-14 12:02:03 +02:00
Gauthier PC portable 024
0fe46b53d8 FIX : method_exists needs object at first param 2021-07-13 15:18:40 +02:00
Laurent Destailleur
7a589921fe Fix #18142 2021-07-13 13:10:19 +02:00
Laurent Destailleur
df3d88570c Fix missing column in migration 2021-07-13 11:39:08 +02:00
Laurent Destailleur
d3f324c2d4 Try a better fix for #18105 2021-07-12 16:55:16 +02:00
Laurent Destailleur
a2de6c00a0 Prepare 13.0.4 2021-07-12 12:26:21 +02:00
Laurent Destailleur
5b6358d938 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-07-08 23:43:19 +02:00