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

1801 Commits

Author SHA1 Message Date
Laurent Destailleur
c58451dbb6 Code comment 2021-01-04 16:07:54 +01:00
Regis Houssin
e36ae4ac90 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2021-01-02 13:14:30 +01:00
Regis Houssin
aec01a95fc FIX again and again 2020-12-29 17:48:52 +01:00
Florian HENRY
1e438b686e fix stickler 2020-12-28 21:32:46 +01:00
Florian HENRY
806b40662f merge develop 2020-12-28 21:15:25 +01:00
Laurent Destailleur
1546805b9e
Merge pull request #15500 from frederic34/patch-10 
NEW add db fields note_public note_private for ecm
 2020-12-27 15:07:51 +01:00
Florian HENRY
720539ff46 on goung 2020-12-23 23:52:43 +01:00
Florian HENRY
26d3ea2227 on going 2020-12-23 23:32:50 +01:00
Laurent Destailleur
4471d7d1da FIX debug report expense/income 2020-12-23 22:18:38 +01:00
Laurent Destailleur
940f0484ee FIX debug report expense/income 2020-12-23 22:17:05 +01:00
Laurent Destailleur
7fae5ea800 Code clean 2020-12-20 18:21:34 +01:00
Laurent Destailleur
a67068ab7b Fix warnings 2020-12-17 18:08:56 +01:00
Laurent Destailleur
b0d524beed Debug v13 2020-12-17 11:57:12 +01:00
David Bensel
bc9f7c83f4 update 2020-12-14 22:40:47 +03:00
Laurent Destailleur
3d33d3aa3a Fix warning 2020-12-13 14:36:00 +01:00
Frédéric FRANCE
346fe8ae85
clean 2020-12-12 22:35:51 +01:00
Frédéric FRANCE
4664ac1a1c
socialnetworks links 2020-12-12 17:00:23 +01:00
Laurent Destailleur
2adbd29b49 Debug generation of doc from modulebuilder 2020-12-11 14:22:36 +01:00
Laurent Destailleur
1f28590e5e Fix style 2020-12-10 19:05:54 +01:00
Laurent Destailleur
6e403e6ce0 Fix warnings 2020-12-07 18:29:14 +01:00
Frédéric FRANCE
a2eab824c1
Merge remote-tracking branch 'upstream/develop' into patch-10 2020-12-04 20:42:22 +01:00
Laurent Destailleur
d88173d7ba Fix bad column 2020-12-02 19:13:32 +01:00
Laurent Destailleur
9e18997e64 FIX #15595 2020-12-02 16:35:43 +01:00
Laurent Destailleur
49be354c3e Fix warning 2020-12-02 14:05:17 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-12-01 01:41:19 +00:00
Laurent Destailleur
2707c0b89b Look and feel v13 2020-11-30 20:13:42 +01:00
Laurent Destailleur
958893228a Fix combo to add contact and status of contact on popup 2020-11-30 15:18:58 +01:00
Frédéric FRANCE
1704de39bb
Merge remote-tracking branch 'upstream/develop' into patch-10 2020-11-27 11:18:04 +01:00
Laurent Destailleur
47a5037155 Fix dolGetFirstLastname() for 4 and 5 2020-11-27 01:18:01 +01:00
Laurent Destailleur
3588781180 Debug v13 2020-11-26 14:15:20 +01:00
Laurent Destailleur
e272130a6a Fix phpcs 2020-11-26 08:40:08 +01:00
Laurent Destailleur
74605cec12 Fix warning 2020-11-25 18:07:52 +01:00
Laurent Destailleur
4d90fb22de Fix sql syntax error 2020-11-25 15:07:26 +01:00
Laurent Destailleur
5030f0c587 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/opensurvey/wizard/create_survey.php
 2020-11-25 14:55:31 +01:00
Laurent Destailleur
bf7b6ee00d Fix delete of proposal 2020-11-25 14:15:59 +01:00
Frédéric FRANCE
66ad0e5b13
add note on ecm files 2020-11-24 18:54:59 +01:00
Laurent Destailleur
efc539c4b4 Fix css 2020-11-23 19:53:58 +01:00
Laurent Destailleur
2f6f242d99 CSS 2020-11-23 12:29:38 +01:00
Laurent Destailleur
9004be1df2 Debug feature to send remind by email 2020-11-21 17:42:07 +01:00
Laurent Destailleur
6bbeb6d3a0 Fix debug creation of shipment with virtual product. 2020-11-16 16:31:05 +01:00
Laurent Destailleur
ac5fa6c6df Clean code 2020-11-16 12:54:16 +01:00
Laurent Destailleur
2e0e42e918 Fix warning 2020-11-15 14:37:21 +01:00
Frédéric FRANCE
0a5e041775
Merge remote-tracking branch 'upstream/develop' into odtformembers 2020-11-14 00:56:21 +01:00
Frédéric FRANCE
4ca3c0aa95
Add odt for members 2020-11-14 00:48:13 +01:00
Laurent Destailleur
3c5ef18b36 FIX #15390 2020-11-14 00:47:28 +01:00
Laurent Destailleur
5498800ad6
Update commonobject.class.php 2020-11-13 10:02:34 +01:00
Günter Lukas
2da8fb75a8
Fix #15371 
Extrafields from type "select" depending on other fields not working in Safari & jquery select2 #15371
 2020-11-12 15:59:42 +01:00
Laurent Destailleur
03e60bf084 Fix warning 2020-11-11 20:27:21 +01:00
Laurent Destailleur
90884d8085 Fix compatibility with date_delivery 2020-11-11 18:08:40 +01:00
Laurent Destailleur
807d3b99c9 Fix update field when visilbity is 4 or -4 2020-11-09 09:53:56 +01:00
Laurent Destailleur
c071dd254b Fix warning 2020-11-07 14:35:28 +01:00
Laurent Destailleur
a72107ce06 Fix regression 2020-11-07 14:33:21 +01:00
Laurent Destailleur
2fdba3ad46 Fix warning 2020-11-07 12:53:52 +01:00
Laurent Destailleur
2da6fc1ef0 Remove warning 2020-11-07 12:06:14 +01:00
Laurent Destailleur
fe8d93f72d Fix phpcs 2020-11-07 01:17:54 +01:00
Laurent Destailleur
824b778d51
Update commonobject.class.php 2020-11-05 09:07:06 +01:00
Francis Appels
5866facf11 Update commonobject. 
Don't think $fk_delivery_address is deprecated, also no alternative indicated.
Switch of implode paramenters.
showInputField preselected value for array type can be array.
 2020-11-04 20:31:55 +01:00
Laurent Destailleur
b0e2d40533 Debug and fix v13 2020-11-03 14:19:54 +01:00
Laurent Destailleur
878b8f25de
Update commonobject.class.php 2020-11-02 09:29:26 +01:00
Frédéric FRANCE
a1016d79a2
initSpecimenCommon 2020-11-01 20:33:06 +01:00
Laurent Destailleur
125b94d749
Merge pull request #15234 from frederic34/patch-8 
doxygen
 2020-10-31 15:05:41 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Frédéric FRANCE
78b94c775b
Update commonobject.class.php 2020-10-31 13:59:46 +01:00
Laurent Destailleur
1af3709793
Merge pull request #15232 from frederic34/patch-6 
doxygen
 2020-10-31 13:50:28 +01:00
Laurent Destailleur
2b09b7be8e Fix css 2020-10-31 13:47:50 +01:00
Frédéric FRANCE
85b3b5de36
Update commonobject.class.php 2020-10-31 13:24:09 +01:00
Laurent Destailleur
a24071492e Start fix for php8 compatibility 2020-10-30 05:56:07 +01:00
Laurent Destailleur
8c646cdf4f
Merge pull request #15207 from frederic34/patch-11 
Mutualise code, introduce MAIN_ALL_TOWN_TO_UPPER
 2020-10-29 17:49:16 +01:00
Regis Houssin
032813fa19 FIX extrafield date not recover in create/edit mode 2020-10-29 11:05:45 +01:00
Frédéric FRANCE
4d716e74bd
Mutualise code, introduce MAIN_ALL_TOWN_TO_UPPER 2020-10-28 19:06:45 +01:00
Scrutinizer Auto-Fixer
208740c9c4 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-28 16:49:52 +00:00
Laurent Destailleur
efce53abd1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
	htdocs/expensereport/class/expensereport.class.php
 2020-10-26 18:17:23 +01:00
Laurent Destailleur
2c2142ddba Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-10-26 18:13:47 +01:00
Laurent Destailleur
adeddc70ca FIX Deletion of expensereport + other generated object not complete. 2020-10-26 18:10:58 +01:00
Laurent Destailleur
2638d4596a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/actions_sendmails.inc.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/facture/card.php
 2020-10-25 21:33:13 +01:00
Laurent Destailleur
cd4d738a56 Merge branch 'translateModLivraison2ModDelivery' of 
https://github.com/orebd/dolibarr into develop

# Conflicts:
#	htdocs/install/mysql/migration/12.0.0-13.0.0.sql
 2020-10-25 16:01:18 +01:00
Laurent Destailleur
e7743948cb
Merge pull request #15120 from frederic34/patch-6 
Update commonobject.class.php
 2020-10-25 14:50:56 +01:00
Maxime Kohlhaas
bedfb7ac8d Fix BOM position field 2020-10-24 19:19:06 +02:00
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉 2020-10-23 20:08:35 +02:00
Frédéric FRANCE
c3863aeed8
Update commonobject.class.php 2020-10-23 18:18:01 +02:00
Laurent Destailleur
f00fa93903 FIX check on required field when updating 1 extrafields. 2020-10-23 17:31:17 +02:00
Laurent Destailleur
572637b726 Enhance update of 1 extrafield (simple update instead of delete+insert) 2020-10-23 15:31:13 +02:00
Laurent Destailleur
0616b9bc9b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/card.php
	htdocs/compta/prelevement/line.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/functions2.lib.php
	htdocs/core/tpl/card_presend.tpl.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2020-10-22 17:55:38 +02:00
Laurent Destailleur
a17c391efe Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/product/composition/card.php
 2020-10-22 17:38:48 +02:00
Laurent Destailleur
cfcac7e053 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/lib/functions2.lib.php
 2020-10-22 17:34:48 +02:00
Florian HENRY
d4fd71d0b3 fix #14649 2020-10-20 19:58:11 +02:00
Laurent Destailleur
f2fafe04b6 Update doc 2020-10-17 18:16:03 +02:00
Alexandre SPANGARO
b3b37dd9ee Fix sticklerCI 2020-10-09 09:32:50 +02:00
Alexandre SPANGARO
ca7ad35342 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-10-09 06:39:42 +02:00
Aurélien
c8cd55e158
debug access right after rename class #14697 2020-10-06 15:57:50 +02:00
Aurélien
1af42b313c
rename livraison pdf and dependencies #14697 2020-10-06 13:32:02 +02:00
Aurélien
af7c23b2ac
rename folder admin/livraison.php and dependencies #14697 2020-10-06 12:05:24 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
Laurent Destailleur
879d041398 Can force the typeof check of GETPOST into $fields for type text. 2020-09-29 20:48:40 +02:00
Laurent Destailleur
33d578a660 Fix bad management of default value in database on create form 2020-09-26 04:25:06 +02:00
Laurent Destailleur
c61e8f052b NEW Add property cssview when declaring fields of an object 2020-09-22 08:54:40 +02:00
Laurent Destailleur
54c0f742b1 Fix escape 2020-09-19 21:19:04 +02:00
Laurent Destailleur
c4b5f5a249 Maxi clean of code 2020-09-18 01:29:17 +02:00
Laurent Destailleur
e5191cad24 Move code of incoterm into the Incoterm Trait. 2020-09-16 02:50:18 +02:00
Laurent Destailleur
1f8278c8ca Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/core/class/html.formmail.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/langs/en_US/other.lang
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-09-12 04:42:59 +02:00