lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
106,551 Commits 43 Branches 150 Tags 886 MiB
3697cb9ca4
Commit Graph

106551 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
3697cb9ca4 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/reception/class/reception.class.php
 2022-02-17 11:34:54 +01:00
Laurent Destailleur
67cb268324 Update example conf file with force_install_lockinstall 2022-02-17 11:33:34 +01:00
Laurent Destailleur
626a5b90f1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-16 21:23:45 +01:00
Laurent Destailleur
c3733a92e1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
 2022-02-16 21:22:49 +01:00
Laurent Destailleur
eb8caf7419 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-02-16 21:17:19 +01:00
Laurent Destailleur
c16e013b99 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
 2022-02-16 21:13:49 +01:00
Laurent Destailleur
92cb95a184
Merge pull request #20064 from ATM-Consulting/FIX_uniformize_pdf_logo_behaviour 
Fix uniformize pdf logo behaviour for supplier orders
 2022-02-16 21:09:45 +01:00
Laurent Destailleur
131ae92cc6 FIX #20063 2022-02-16 21:05:23 +01:00
lvessiller
9b1d800311 NEW add triiger and event on totally received status 2022-02-16 20:52:01 +01:00
lvessiller
690a91d546 NEW automatically set totally received status in reception 2022-02-16 20:51:47 +01:00
Laurent Destailleur
dfcc49d466 Doc 2022-02-16 20:50:27 +01:00
Laurent Destailleur
67168ffb16
Merge pull request #20065 from Easya-Solutions/new-reception-all-products 
NEW automatically set totally received status in reception
 2022-02-16 20:48:50 +01:00
Laurent Destailleur
ea4eed31f5
Merge pull request #20066 from javieralapps4up/develop 
FIX Andorra needs Code Banque
 2022-02-16 20:38:26 +01:00
Laurent Destailleur
a7fab01059
Merge pull request #20069 from vincentjdc/expensse-report-download-fix 
Fixes expensereport downloads
 2022-02-16 20:37:32 +01:00
Laurent Destailleur
5cf8fae151
Merge pull request #20072 from fappels/15_fix_barcode_viewimage 
Fix barcode viewimage regression on yogosha8628
 2022-02-16 20:36:59 +01:00
Laurent Destailleur
cebada1966
Merge pull request #20071 from frederic34/patch-1 
NEW Hook getNomUrl available everywhere in tooltip of ref links
 2022-02-16 20:36:02 +01:00
Laurent Destailleur
ed10db668d
Merge pull request #20073 from atm-quentin/FIX_13_combinations 
FIX weight is lost if it's comma on combinations card
 2022-02-16 20:34:24 +01:00
Laurent Destailleur
73e2b13418 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-16 20:32:30 +01:00
Laurent Destailleur
2a18bce2f3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/api/index.php
	htdocs/langs/en_US/productbatch.lang
	htdocs/langs/fr_FR/productbatch.lang
	htdocs/ticket/list.php
 2022-02-16 20:31:55 +01:00
Laurent Destailleur
906651d404 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-16 20:27:26 +01:00
Laurent Destailleur
e0563d2bef Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-16 20:27:07 +01:00
Laurent Destailleur
7029bb7000
Merge pull request #20077 from AlexisLaurier/bugfix/paymentByBankTransfertIndexTabEntity 
add missing entity check on list of withdraws on index of paymentbyba…
 2022-02-16 20:26:39 +01:00
Laurent Destailleur
aad292b41b
Merge pull request #20074 from altairisfr/fix_parentline_13.0 
More generic management of parentline
 2022-02-16 20:25:04 +01:00
Laurent Destailleur
a33ca21151
Merge pull request #20079 from AlexisLaurier/bugfix/fixPrelevmentLineDetails-ForBankPaymentTransfert 
manage details of prelevment line for bank transfer
 2022-02-16 20:22:54 +01:00
Laurent Destailleur
ab2d3460d7
Merge pull request #20080 from Easya-Solutions/new-total-mark-rate-in-list 
NEW total mark rate in list
 2022-02-16 20:22:15 +01:00
Laurent Destailleur
645bf9564e
Merge pull request #20084 from altairis-noe/stock_doc14 
FIX: correct warehouse document location
 2022-02-16 20:18:43 +01:00
Laurent Destailleur
357f6e234a
Merge pull request #20086 from altairis-noe/duplicate_serial_move_trans 
FIX : translation string instead of error message text
 2022-02-16 20:18:01 +01:00
Laurent Destailleur
b3d71b2a12
Merge pull request #20087 from ATM-Consulting/FIX_job_card_button_add_event 
FIX : HRM | Change button and add title on job card
 2022-02-16 20:17:10 +01:00
Laurent Destailleur
36c04a7b82
Merge pull request #20088 from Hystepik/develop#3 
Fix : fix warnings php 8.0 on modulebuilder
 2022-02-16 20:16:27 +01:00
Laurent Destailleur
190d8d6143
Merge pull request #19076 from inovea-conseil/FIX_ISSUE_DB_ERROR_SYNTAX-#18921 
FIX ISSUE DB_ERROR_SYNTAX #18921
 2022-02-16 20:15:25 +01:00
Laurent Destailleur
e1bf1a54f7
Merge pull request #20089 from thomas-Ngr/14_fix_ticket_return_list_db_error_syntax 
fix: ticket return list creates db error syntax
 2022-02-16 20:14:27 +01:00
Laurent Destailleur
1ede8a30b2 Missing NOSESSION 2022-02-16 17:49:05 +01:00
Florian
aa2a57ff95 Check that the value is not an array 2022-02-16 17:00:54 +01:00
Florian
7ed6ca6ec6 FIX ISSUE DB_ERROR_SYNTAX-#18921 2022-02-16 17:00:50 +01:00
lmarcouiller
a9496220b5 Fix : warnings php 8.0 2022-02-16 16:43:52 +01:00
Atm-Gregr
5f09ac61b2 insert precommit1 2022-02-16 16:27:47 +01:00
Atm-Gregr
1f2659d411 insert precommit 2022-02-16 16:26:57 +01:00
Atm-Gregr
038298a638 change button and add title 2022-02-16 16:10:48 +01:00
Noé Cendrier
98c50f531c translation string instead of error message text 2022-02-16 15:57:39 +01:00
Laurent Destailleur
4a343247b0 Return a 404 http code when CSRF protection fails 2022-02-16 14:34:32 +01:00
Laurent Destailleur
69266ae61f Fix text 2022-02-16 14:14:30 +01:00
Laurent Destailleur
60ada5fe72 Can filter on status purchase on list of products 2022-02-16 14:06:16 +01:00
lvessiller
7e17167faf NEW total mark rate in list 2022-02-16 11:45:29 +01:00
Alexis LAURIER
ff8dcdc4b7 manage details of prelevment line for bank transfer 2022-02-16 10:52:20 +01:00
Alexis LAURIER
8b0280a9d2 add missing entity check on list of withdraws on index of paymentbybanktransfert 2022-02-16 10:26:44 +01:00
Laurent Destailleur
453871bf38 css 2022-02-15 23:01:14 +01:00
Frédéric FRANCE
935482ee22
uniformize 2022-02-15 19:04:18 +01:00
Frédéric FRANCE
dad73b755e
fix merge 2022-02-15 18:46:41 +01:00
Frédéric FRANCE
a613553f37
Merge branch 'hookgetnomurl' into patch-1 2022-02-15 18:44:06 +01:00
Frédéric FRANCE
c8640f329e
add missing global 2022-02-15 18:31:05 +01:00