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

2058 Commits

Author SHA1 Message Date
Laurent Destailleur
c1d3ddf10b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-28 18:31:06 +02:00
Laurent Destailleur
bb94ea7334 Fix debug car reception: Fill/reset link, colspan, translation 2021-08-28 17:24:05 +02:00
Laurent Destailleur
c02fb6b9a8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-28 03:15:47 +02:00
Laurent Destailleur
51a4d7630f Clean code 2021-08-28 00:56:37 +02:00
Laurent Destailleur
2dd91bf312 Clean code 2021-08-27 23:36:06 +02:00
Laurent Destailleur
3b6559b1a6 Clean code by adding cast int. 2021-08-27 18:53:45 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
Laurent Destailleur
65629711d0 FIX #18484 2021-08-25 14:53:14 +02:00
Laurent Destailleur
dc006b0ebb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-08-23 19:44:02 +02:00
Laurent Destailleur
8485fee5f9 Cast numeric into on sql request 2021-08-23 19:33:24 +02:00
Laurent Destailleur
23829ae637 Cast numeric into on sql request 2021-08-23 18:56:46 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Philippe GRAND
538b2e2a5f fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\htdocs\core\class\commonobject.class.php on line 1705 2021-08-22 19:47:06 +02:00
Laurent Destailleur
82db3ae1a9 NEW Use lang selector when using a field key 'lang' in modulebuilder 2021-08-18 01:54:13 +02:00
Laurent Destailleur
bbcea38793 Fix phpcs 2021-08-17 21:58:06 +02:00
Laurent Destailleur
59c9c48844
Merge branch 'develop' into new_validation_method_for_common_object 2021-08-17 19:35:36 +02:00
Laurent Destailleur
fb1e5f72d3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 18:11:08 +02:00
Laurent Destailleur
7986f4881c
Update commonobject.class.php 2021-08-17 16:12:45 +02:00
Quentin VIAL-GOUTEYRON
5f4ab188cf NEW hook after rank update 2021-08-17 09:33:50 +02:00
Laurent Destailleur
d7317025e9 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/pdf_other.php
 2021-08-11 22:09:05 +02:00
Laurent Destailleur
ef4468153d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-08-11 22:07:13 +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
1cdab44252
Merge pull request #18363 from fappels/15_update_hook_printOriginObjectLine 
Remove strange check on hook printOriginObjectLine.
 2021-08-11 15:55:55 +02:00
Laurent Destailleur
bef0989b15 Missing declaration 2021-08-10 13:34:21 +02:00
Francis Appels
91ef2a44fd Remove strange check on hook printOriginObjectLine. 
Now need reshook.
 2021-08-09 11:17:11 +02:00
Florian HENRY
ae5bb956ac fix invoice in stand registration pb 2021-07-29 17:18:05 +02:00
Laurent Destailleur
ce27feda84 Debug v14 
Fix email collector (Creation of thirparty, set of extrafields)
 2021-07-16 00:12:58 +02:00
Laurent Destailleur
9aad07f20c Remove log 2021-07-15 21:57:32 +02:00
Laurent Destailleur
5da40d80f7 Fix css 2021-07-15 16:35:06 +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
Alexis LAURIER
cd5e1d603e fix showInputField checkbox and radio type 2021-07-14 12:02:03 +02:00
Christophe Battarel
7e174412b7 FIX display of extrafields on shipping lines 2021-07-07 10:30:01 +02:00
Laurent Destailleur
f6efe51032 Fix trouble with product id = -1 2021-07-04 21:02:02 +02:00
Laurent Destailleur
6ae1d192e4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/card.php
 2021-07-02 16:14:12 +02:00
John BOTELLA
167ae5b0f2
Merge branch 'develop' into new_validation_method_for_common_object 2021-07-02 12:04:14 +02:00
Frédéric FRANCE
3aa24cccff
fix can't remove extrafield date or datetime value 2021-07-01 15:15:35 +02:00
Laurent Destailleur
bda36337cd Prepare fix #yogosha6443 2021-06-30 17:22:36 +02:00
Laurent Destailleur
c7befd9acc Fix php8 (related to #18019) 2021-06-29 19:49:37 +02:00
Laurent Destailleur
62822c424c Fix php8 2021-06-23 01:34:14 +02:00
Laurent Destailleur
12748640a5 Add log 2021-06-22 18:04:06 +02:00
Laurent Destailleur
bcffbe3d67 Test fix 2021-06-22 17:09:02 +02:00
ATM john
4d043b713c WIP - create validation method for common object 2021-06-21 21:54:03 +02:00
Laurent Destailleur
a0b594fbdc Debug emailcollector 2021-06-21 19:47:43 +02:00
Laurent Destailleur
e3e2dfd764 Fix generation of ODT (test if temporary directory is writable) 2021-06-20 05:11:46 +02:00
ATM john
be367c589f WIP - create validation method for common object 2021-06-14 21:12:48 +02:00
ATM john
23765bf459 WIP - create validation method for common object 2021-06-14 20:59:46 +02:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +02:00
Laurent Destailleur
046215f64a Fix PHP8 2021-06-14 02:08:28 +02:00
Laurent Destailleur
f8f951977c Debug v14 2021-06-14 01:33:01 +02:00
ATM john
43ecba2e63 WIP - create validation method for common object 2021-06-12 14:16:40 +02:00
ATM john
578dc9adde WIP - create validation method for common object 2021-06-12 12:58:20 +02:00
Laurent Destailleur
756786f717 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/fourn/facture/card.php
	htdocs/holiday/list.php
	htdocs/paybox/admin/paybox.php
	htdocs/paypal/admin/paypal.php
	htdocs/product/price.php
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/permonth.php
	htdocs/projet/activity/perweek.php
	htdocs/stripe/admin/stripe.php
 2021-06-11 19:05:05 +02:00
Laurent Destailleur
1bf63c7862 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/lib/functions.lib.php
 2021-06-10 16:53:09 +02:00
Laurent Destailleur
24f8b6386e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2021-06-10 16:47:45 +02:00
Laurent Destailleur
8a46fd376f
Update commonobject.class.php 2021-06-10 12:58:42 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
ATM john
f1b1dcd1b1 WIP - create validation method for common object 2021-06-06 21:53:17 +02:00
ATM john
aa94d40ad0 WIP - create validation method for common object 2021-06-06 21:12:03 +02:00
ATM john
1aca7efce3 Fix childtablesoncascade doc 2021-06-06 13:15:03 +02:00
Laurent Destailleur
702de427bd
Merge pull request #17758 from frederic34/patch-20 
fix warnings
 2021-06-04 11:52:53 +02:00
Frédéric FRANCE
ca66cdad01
debug intracomm report transport mode 2021-06-03 21:47:10 +02:00
ATM john
a7300d01b0 WIP - create validation method for common object 2021-06-03 09:49:07 +02:00
Frédéric FRANCE
ca0654323f
fix warnings 2021-05-27 23:11:05 +02:00
Givriz
1cf7d0cee7 Compatibility phpv8 2021-05-18 20:13:26 +02:00
Laurent Destailleur
7a76dc4648
Merge pull request #17382 from DorianVabre/dev_EventOrganizer_payment 
new: working on conference or booth object and event type #FoundationFunding
 2021-05-06 16:31:30 +02:00
Laurent Destailleur
655056ed31 Debug v14 2021-04-29 12:10:55 +02:00
Dorian Vabre
cb21131259
Merge branch 'develop' into dev_EventOrganizer_payment 2021-04-29 10:31:43 +02:00
Laurent Destailleur
062dc28850
Merge pull request #17388 from aspangaro/14a30 
NEW: Add option SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD
 2021-04-26 21:18:48 +02:00
Laurent Destailleur
d138e7410b Clean code 2021-04-26 19:12:23 +02:00
Laurent Destailleur
fd2d317b4a Fix #yogosha5881 2021-04-25 15:55:36 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00
Alexandre SPANGARO
f60df8964a NEW: Add option SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD 2021-04-24 08:05:00 +02:00
Dorian Vabre
a500d83c0b linked invoice and attendee 2021-04-20 16:09:22 +02:00
Alexandre SPANGARO
f64d0377c5 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-04-04 06:03:41 +02:00
Laurent Destailleur
3744bc6a7a FIX #yogosha5746 - next step (work in progress) 2021-03-30 18:17:13 +02:00
Laurent Destailleur
fae3cca494 FIX #yogosha5746 - next step (work in progress) 2021-03-30 17:45:15 +02:00
Laurent Destailleur
6e422d26f3 FIX #yogosha5746 - next step (wip) 2021-03-30 16:20:18 +02:00
Laurent Destailleur
6c98276ead FIX #yogosha5782 2021-03-30 11:26:49 +02:00
Laurent Destailleur
fb84608586 Clean sql 2021-03-30 03:37:54 +02:00
Laurent Destailleur
3616d2ba44 FIX #yogosha5770 2021-03-29 23:24:52 +02:00
Laurent Destailleur
a4987c6e4f
Merge branch 'develop' into 14a22 2021-03-29 20:35:35 +02:00
Laurent Destailleur
3a4bb69c05 FIX #yogosha5749 2021-03-29 15:32:09 +02:00
Laurent Destailleur
ce1f8289a4 FIX #yogosha5746 2021-03-29 15:07:23 +02:00
Alexandre SPANGARO
2a1cc04b66 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-03-28 06:16:33 +02:00
Laurent Destailleur
eeba9e4d50 Code comment 2021-03-24 21:58:06 +01:00
Laurent Destailleur
21a9779fe2 FIX inconsistency in margin recording with option "Force to sale price" 2021-03-24 21:49:45 +01:00
Laurent Destailleur
a5034d44f7 $_POST war 2021-03-24 19:53:31 +01:00
Laurent Destailleur
00e48aa922 Clean and secured code for ajax/row.php 2021-03-23 16:09:02 +01:00
Laurent Destailleur
15440917b1 Fix #ygosha5698 2021-03-22 11:30:18 +01:00
Laurent Destailleur
e334e83a64
Merge branch 'develop' into 14a22 2021-03-20 13:42:54 +01:00
Frédéric FRANCE
8142d76394
fix php8 warnings 2021-03-20 10:50:02 +01:00
Frédéric FRANCE
fced63e93b
fix php8 warning 2021-03-17 20:11:22 +01:00
Frédéric FRANCE
4e8ea5c07e
fix php8 warnings 2021-03-16 21:13:15 +01:00
Laurent Destailleur
87ab711a0f
Merge pull request #16707 from FHenry/dev_EventOrganisation 
new: working on conference or booth object and event type #FoundationFunding
 2021-03-16 10:34:55 +01:00
Laurent Destailleur
897f4be033
Merge pull request #16712 from frederic34/patch-9 
fix php8 warnings
 2021-03-16 10:33:01 +01:00
Alexandre SPANGARO
6e17a588bb Merge remote-tracking branch 'upstream/develop' into 14a22 2021-03-16 03:26:28 +01:00
Frédéric FRANCE
f7d43ce4fb
fix php8 warnings 2021-03-15 20:55:59 +01:00
Frédéric FRANCE
a0e6f454ff
fix php8 warnings 2021-03-15 20:31:55 +01:00
Florian HENRY
177a6bfe4f conference or booth card and list ok 2021-03-15 20:20:53 +01:00
Laurent Destailleur
a8c34a5b05 Invert MAIN_EXTRAFIELDS_USE_SELECT2 into 
MAIN_EXTRAFIELDS_DISABLE_SELECT2
 2021-03-15 14:16:55 +01:00
Laurent Destailleur
7d1e18f5ab
Merge pull request #16625 from FHenry/dev_EventOrganisation 
new: working on conference or booth object and event type #FoundationFunding
 2021-03-15 11:37:57 +01:00
Laurent Destailleur
cc10106a21 Fix protection on int 2021-03-14 12:20:23 +01:00
Laurent Destailleur
12f50a76d7 Fix yogosha #5627 2021-03-14 11:48:39 +01:00
Florian HENRY
862926316a working on list 2021-03-11 19:09:42 +01:00
Laurent Destailleur
b1f4c29fde Fix missing alias 2021-03-09 20:12:14 +01:00
Laurent Destailleur
3cb072f67a
Update commonobject.class.php 2021-03-09 15:13:20 +01:00
Florian HENRY
ce5324c08c Merge HEAD, branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_allowAliasInCommonObject_GetFiledList 2021-03-09 10:24:07 +01:00
Florian HENRY
bcbf8bb72a allow table alias into commonObject getFieldList 2021-03-09 10:21:32 +01:00
Laurent Destailleur
0a0bb92689 Fix phpcs 2021-03-06 11:37:23 +01:00
Laurent Destailleur
3cbced439a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/listevents.php
	htdocs/compta/bank/line.php
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/paiement/cheque/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/ticket.lib.php
	htdocs/core/modules/mailings/modules_mailings.php
	htdocs/core/tpl/extrafields_view.tpl.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/cron/list.php
	htdocs/expedition/card.php
	htdocs/mrp/mo_list.php
	htdocs/product/stock/productlot_card.php
	htdocs/public/emailing/mailing-read.php
	htdocs/public/emailing/mailing-unsubscribe.php
	htdocs/ticket/list.php
	test/phpunit/FactureRecTest.php
 2021-03-05 19:29:09 +01:00
Laurent Destailleur
7d20df8054
Merge pull request #16177 from atm-gauthier/NEW/add_real_payments_on_salaries 
NEW Salary payment request and Salary payment are 2 different steps in workflow on Salary payment recording
 2021-03-04 16:53:54 +01:00
Laurent Destailleur
ffa0e6c391 FIX Timezone management for datetime on list of events 2021-03-04 15:34:29 +01:00
Laurent Destailleur
33c4180781 FIX Timezone management for datetime with modulebuilder 2021-03-04 09:36:19 +01:00
Frédéric FRANCE
2d9f00eb57
Update commonobject.class.php 2021-03-03 12:24:44 +01:00
lvessiller
66ad8fbb24 FIX select list dependancies on common object (FIX #16510) 2021-03-02 17:21:55 +01:00
Laurent Destailleur
42329b10c9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	build/generate_filelist_xml.php
	htdocs/comm/propal/card.php
	htdocs/commande/card.php
	htdocs/compta/facture/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/modulebuilder.lib.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/supplier_proposal/card.php
	htdocs/ticket/list.php
 2021-03-02 15:27:20 +01:00
Florian HENRY
2c163b8163 fix #16510 2021-03-02 15:22:22 +01:00
Laurent Destailleur
1f25f2bb7e Fix phpcs 2021-03-02 15:09:29 +01:00
Laurent Destailleur
3982a36a3e
Update commonobject.class.php 2021-03-02 14:47:35 +01:00
Florian HENRY
27c354567a FIX : select list dependencies now work for ModuleBuilder sellist field 2021-03-02 14:06:11 +01:00
Frédéric FRANCE
a4e25359e7
add missing rule 2021-03-01 20:37:16 +01:00
Gauthier PC portable 024
6da28f5e44 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-03-01 11:12:03 +01:00
Alexandre SPANGARO
7a3dfda8ee Merge remote-tracking branch 'upstream/develop' into 14a22 2021-02-28 21:30:25 +01:00
Laurent Destailleur
886cbc61c8 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/core/boxes/box_factures_fourn.php
	htdocs/core/boxes/box_factures_fourn_imp.php
	htdocs/core/boxes/box_ficheinter.php
	htdocs/core/boxes/box_members.php
	htdocs/core/boxes/box_propales.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/class/fournisseur.facture.class.php
 2021-02-28 13:37:45 +01:00
Laurent Destailleur
2a3b3753a8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-28 13:27:38 +01:00
Alexandre SPANGARO
ca7958f273 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-02-28 07:32:23 +01:00
Laurent Destailleur
753b1d1e11 FIX status on tooltip on widgets 2021-02-27 19:43:56 +01:00
Laurent Destailleur
5c0ea476e1 Look and feel v14 2021-02-27 12:45:07 +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
Gauthier PC portable 024
c996871f98 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-26 11:50:18 +01:00
Frédéric FRANCE
554e449e40
code syntax core directory 2021-02-23 22:03:23 +01:00
Gauthier PC portable 024
c0160a5f3b Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-23 15:20:15 +01:00
Laurent Destailleur
f6080d45fa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-22 16:21:26 +01:00
Laurent Destailleur
912f9f9bdb Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/contact/card.php
	htdocs/core/actions_massactions.inc.php
 2021-02-22 15:54:24 +01:00
Laurent Destailleur
c010cab47e Fix translation of default value for contacts 2021-02-22 15:51:00 +01:00
Alexandre SPANGARO
7f4040e464 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-02-22 11:59:13 +01:00
Alexandre SPANGARO
22c936ba19 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-02-22 11:28:36 +01:00
Laurent Destailleur
f99232e66e
Merge branch 'develop' into 14a21 2021-02-22 11:18:07 +01:00
Gauthier PC portable 024
939d406ab1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-22 09:10:24 +01:00
Alexandre SPANGARO
ae4fc565e1 Widget & commonobject 2021-02-22 05:38:31 +01:00
Alexandre SPANGARO
71ce871da6 Fix element 2021-02-22 05:13:14 +01:00
Alexandre SPANGARO
818a826c3e Code enhanced - Standardize field name 2021-02-21 22:10:00 +01:00
Alexandre SPANGARO
2cd181b86d Code enhanced - Standardize field name #14697 2021-02-21 22:07:58 +01:00
Laurent Destailleur
e3419df36e
Merge branch 'develop' into 14a20 2021-02-21 20:28:06 +01:00
Laurent Destailleur
4b632fb24f
Merge branch 'develop' into 14a19 2021-02-20 17:08:23 +01:00
Laurent Destailleur
7c25f06f58
Merge pull request #16353 from aspangaro/14a18 
Code enhanced - Standardize field name #14697
 2021-02-20 16:51:34 +01:00
Alexandre SPANGARO
3dcfe40e71 Code enhanced - Standardize field name #14697 2021-02-20 08:00:27 +01:00
Alexandre SPANGARO
1017d480f9 Code enhanced - Standardize field name #14697 2021-02-20 07:08:37 +01:00