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

88243 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robin
cb4c047aa3 Merge branch '12.0' of https://github.com/Robin-Yann/dolibarr into 12.0 
htdocs/projet/card.php
 2021-03-19 10:00:10 +01:00
Robin
d852816101 FIX: fix checkbox displayed according to module project setup parameters 2021-03-19 09:54:11 +01:00
Robin
b3757a6f69 FIX: fix checkbox displayed according to module project setup parameters - work in progress 2021-03-18 11:07:48 +01:00
Laurent Destailleur
a29a9e5435 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-16 15:14:46 +01:00
Laurent Destailleur
66bbc7f54f
Merge pull request #16734 from AlexisLaurier/11.0 
correct nb_expedition count
 2021-03-16 15:12:18 +01:00
Alexis LAURIER
971b97d78f correct nb_expedition count 2021-03-16 15:00:46 +01:00
Laurent Destailleur
b5edfdf6f6
Merge pull request #16687 from atm-florianm/fix/12.0_min_php_version_in_composer_json 
Fix/12.0 min php version in composer json
 2021-03-15 17:16:27 +01:00
Florian Mortgat
a5f6ee5889 Merge branch '12.0' of github.com:Dolibarr/dolibarr into fix/12.0_min_php_version_in_composer_json 2021-03-15 15:06:54 +01:00
Florian Mortgat
631aad94e7 FIX PHP version requirement in composer.json 2021-03-15 15:05:01 +01:00
Laurent Destailleur
d905d92434
Merge pull request #16637 from frederic34/patch-4 
force check if newref needed if project create fail
 2021-03-15 11:31:07 +01:00
Laurent Destailleur
fede7b7a15
Merge pull request #16633 from frederic34/patch-3 
fix number is already used doesn't propose new code with elephant
 2021-03-12 20:18:46 +01:00
Frédéric FRANCE
815a7683a2
force getnextref if project create fail 2021-03-12 16:48:43 +01:00
Frédéric FRANCE
7a2e28497d
fix number is already used doesn't propose new code with elephant 2021-03-12 13:14:53 +01:00
Laurent Destailleur
43836836e4
Merge pull request #16610 from atm-lena/12.0_FIX_Sociales_Create_KeepValues_Error 
FIX create sociales : keep values error form
 2021-03-10 15:30:06 +01:00
Laurent Destailleur
c209d9b45e
Update paiement_charge.php 2021-03-10 15:29:05 +01:00
atm-lena
b798535af9 FIX create sociales : keep values error form 2021-03-10 14:15:03 +01:00
Laurent Destailleur
7cb10eae2e
Merge pull request #16588 from atm-adrien/FIX/add_nowLink_on_socialCharges_card_creation 
FIX : Add "Now" link on social charges creation card
 2021-03-08 16:31:41 +01:00
Laurent Destailleur
8b555d33e7
Merge pull request #16586 from atm-adrien/FIX/rouding_socialesCard_amount_on_card_updating 
FIX : Rounding amount on social charges card updating
 2021-03-08 16:30:53 +01:00
Laurent Destailleur
20c30bade8
Update card.php 2021-03-08 16:30:32 +01:00
Laurent Destailleur
5c7685c1b8
Merge pull request #16581 from frederic34/patch-7 
Do not return specimen if searching empty string value
 2021-03-08 16:29:04 +01:00
Adrien Raze
67c6577177 FIX : Add "Now" link on social charges card creation 2021-03-08 15:47:02 +01:00
Adrien Raze
cbb7751a15 FIX : rounding amount on card updating 2021-03-08 11:51:18 +01:00
Frédéric FRANCE
c0c9ac439f
Update api_agendaevents.class.php 2021-03-08 00:23:05 +01:00
Laurent Destailleur
e5d8267786
Merge pull request #16546 from FHenry/12.0 
fix: set class attribute at right place
 2021-03-06 11:18:02 +01:00
Laurent Destailleur
1ad04bb67a
Merge pull request #16548 from frederic34/patch-5 
Fix #16544
 2021-03-06 11:09:58 +01:00
Laurent Destailleur
98c7814fa3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-05 18:28:37 +01:00
Laurent Destailleur
6aa929cbf8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-05 18:28:15 +01:00
Frédéric FRANCE
7543b63a6e
Fix #16544 2021-03-05 08:49:56 +01:00
Florian HENRY
6de6782458 fix: set class at right place 2021-03-05 08:41:04 +01:00
Laurent Destailleur
eda0b4dc37
Merge pull request #16531 from FHenry/12.0 
avoid warning into modulebuilder
 2021-03-04 16:52:47 +01:00
Laurent Destailleur
672a07fdac
Merge pull request #16535 from atm-greg/Fix_attach_files_when_models_are_available 
Fix : if mailmodels exist in database attached files are always cleared
 2021-03-04 16:45:00 +01:00
atm-greg
c41b59b14c Fix : when we have got models in database attached files are cleared even if we did not have selected a model 2021-03-04 14:23:08 +01:00
Florian HENRY
bf775855f6 avoid warning into modulebuilder 2021-03-04 10:28:41 +01:00
Laurent Destailleur
5fd341bbd3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
 2021-03-02 15:11:18 +01:00
Laurent Destailleur
ef789376e7
Merge pull request #16501 from atm-gauthier/FIX/HeightForTotWhenTooMuchPayment_SI 
FIX : handling $heightforinfotot when he's superior to a page height …
 2021-03-02 12:49:58 +01:00
stickler-ci
d20ba5a665 Fixing style errors. 2021-03-01 15:38:15 +00:00
Gauthier PC portable 024
861b583668 FIX : handling $heightforinfotot when he's superior to a page height on Supplier Invoice 2021-03-01 16:34:42 +01:00
Laurent Destailleur
5afc0e33c9
Merge pull request #16475 from frederic34/patch-4 
FIX #16465
 2021-02-28 13:24:29 +01:00
Frédéric FRANCE
8bfa7565bd
Update commonobject.class.php 2021-02-27 08:52:40 +01:00
Frédéric FRANCE
2cc635fd09
FIX https://github.com/Dolibarr/dolibarr/issues/16465 2021-02-27 08:00:02 +01:00
Laurent Destailleur
5c0fba26e2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-26 10:25:55 +01:00
Laurent Destailleur
549136efeb Removed useless log 2021-02-26 10:25:30 +01:00
Laurent Destailleur
99a17cadb7 Fix sql syntax 2021-02-26 10:25:08 +01:00
Laurent Destailleur
8e8efce7d1 Fix sql syntax 2021-02-26 10:23:53 +01:00
Laurent Destailleur
9db211b1a7
Merge pull request #16433 from ATM-Consulting/fix/11.0_contact_updateRoles_sql_injection_of_socid 
FIX 11.0 - $this->socid injected in query without checking for empty string
 2021-02-26 10:22:50 +01:00
Florian Mortgat
d59ee06438 FIX 11.0 - $this->socid injected in query without checking for empty value 2021-02-25 14:51:57 +01:00
Laurent Destailleur
eee936b91c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-22 15:51:16 +01:00
Laurent Destailleur
c010cab47e Fix translation of default value for contacts 2021-02-22 15:51:00 +01:00
Laurent Destailleur
9b0659c50a
Merge pull request #16238 from frederic34/patch-2 
FIX massaction validate invoice do not regenerate pdf
 2021-02-20 17:13:51 +01:00
Laurent Destailleur
45fda63a20 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-19 14:08:51 +01:00