Laurent Destailleur
1a521bcc99
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/contact/class/contact.class.php
2021-02-26 10:27:55 +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
Laurent Destailleur
563a9bd7ec
Merge pull request #16408 from frederic34/categ_codesyntax
...
code syntax categorie collab directory
2021-02-26 10:22:15 +01:00
Laurent Destailleur
e0cf5468ef
Merge pull request #16409 from frederic34/patch-3
...
fix fourn card
2021-02-26 10:22:04 +01:00
Laurent Destailleur
573ab9f91f
Merge pull request #16410 from frederic34/comm_codesyntax
...
code syntax comm directory
2021-02-26 10:21:48 +01:00
Laurent Destailleur
9b8e8f2571
Merge pull request #16411 from frederic34/commande_codesyntax
...
code syntax commande directory
2021-02-26 10:21:36 +01:00
Laurent Destailleur
ccffa7e2a0
Merge pull request #16412 from frederic34/compta_codesyntax
...
code syntax compta directory
2021-02-26 10:21:22 +01:00
Laurent Destailleur
463dda6d7a
Merge pull request #16413 from frederic34/contact_codesyntax
...
code syntax contact directory
2021-02-26 10:21:01 +01:00
daraelmin
e079ceb9c3
Fix #16420 undefined $model_mail_selected_id
...
Set $model_mail_selected_id to 0 when it is undefined
2021-02-26 08:51:01 +01:00
daraelmin
5d31a93bf0
Fix #16420 - undefined $model_mail_selected_id
...
Set $model_mail_selected_id to 0 when it is undefined
2021-02-26 08:20:51 +01:00
Frédéric FRANCE
ed6d2376f1
code syntax fourn directory
2021-02-25 23:21:30 +01:00
Frédéric FRANCE
fb07484d3f
code syntax fichinter directory
2021-02-25 23:00:32 +01:00
Frédéric FRANCE
d6ffdfe835
code syntax exports externalsite directory
2021-02-25 22:50:40 +01:00
Frédéric FRANCE
8a69fa0d35
code syntax expensereport directory
2021-02-25 22:45:02 +01:00
Frédéric FRANCE
8db4291f88
code syntax expedition directory
2021-02-25 22:38:35 +01:00
Frédéric FRANCE
125c7513da
code syntax ecm emailcollector directories
2021-02-25 22:26:26 +01:00
Frédéric FRANCE
8670cc2d6f
code syntax don directory
2021-02-25 22:18:34 +01:00
Frédéric FRANCE
d97af3f849
code syntax delivery directory
2021-02-25 22:15:04 +01:00
Frédéric FRANCE
ef28a76ad0
code syntax datapolicy dav debugbar directories
2021-02-25 22:09:10 +01:00
Frédéric FRANCE
c11fd091e2
fix translation
2021-02-25 21:18:51 +01:00
Juanjo Menent
e08bfab537
FIX: Bad project filter in ticket list
2021-02-25 16:29:26 +01:00
Christophe Battarel
75298b4ac6
fix for stickler
2021-02-25 16:00:42 +01:00
Christophe Battarel
445974a003
add event management to batch products
2021-02-25 15:47:14 +01:00
Christophe Battarel
a3a8e7c4e4
change hasBatch function
2021-02-25 15:35:45 +01:00
Christophe Battarel
a61fa2b049
differentiate serial numbers from lot management
2021-02-25 15:15:00 +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
Francis Appels
0e89dd7344
Also register movement for 0 produced to update cost.
...
Use correct movement label for negative consumed.
2021-02-25 11:23:19 +01:00
abb
e97468c138
new:Fetch region_code in societe fetch
2021-02-25 09:02:19 +01:00
stickler-ci
a31d5e8dc9
Fixing style errors.
2021-02-24 22:32:48 +00:00
dvdwalker
4c321341d4
Fix: Ajax on/off not saving value in DB after updating to version >=12
...
The issue seams to be that starting in version 12 the "[element]_UPDATE" trigger is called in file core/ajax/objectonoff.php but some properties that are required on $object are not set.
2021-02-24 19:28:47 -03:00
josemariagomezroncero
c0a489ec1a
Update ProductCombination.class.php
...
Product dont update product variation statut when desactivate for sale.
2021-02-24 23:16:46 +01:00
dvdwalker
a683acde62
Fix: Ajax on/off not saving value in DB after updating to version >=12
...
The issue seams to be that starting in version 12 the "[element]_UPDATE" trigger is called in file core/ajax/objectonoff.php but some properties that are required on $object are not set. Those are (at least for product that is what I use):
$object->id
$object->table_element
$object->fields[$field]
The error occurs on the setValueFrom function in core/class/commonobject.class.php file
2021-02-24 17:00:10 -03:00
Frédéric FRANCE
aa56a4f739
typo
2021-02-24 18:20:42 +01:00
Nicolas
0c424db506
Correct stickler
2021-02-24 16:03:24 +01:00
Nicolas
589c757fbf
Correct stickler
2021-02-24 15:57:33 +01:00
Francis Appels
bca9004f36
Fix displayed unit cost of free consumption line
2021-02-24 15:48:44 +01:00
Nicolas
49c0967a3e
NEW option for Takepos to show the total price without tax
2021-02-24 15:48:15 +01:00
Francis Appels
e12db6d1f1
Merge remote-tracking branch 'Dolibarr/develop' into develop_mo_pmp
2021-02-24 15:20:45 +01:00
dvdwalker
3b49792985
Update product.class.php
2021-02-24 10:38:11 -03:00
dvdwalker
6e8828a56a
Merge pull request #1 from Dolibarr/develop
...
Update to 13.0
2021-02-24 10:36:27 -03:00
Laurent Destailleur
f7c119e48c
Fix json decode
2021-02-24 13:02:36 +01:00
Laurent Destailleur
22208b622f
WIP Add lead
2021-02-24 12:55:24 +01:00
Laurent Destailleur
ebb4f03788
Prepare public page for autocreate contact-lead
2021-02-24 12:19:28 +01:00
Laurent Destailleur
3a0b762a6e
Var not defined
2021-02-24 12:01:58 +01:00
Laurent Destailleur
566a0ba785
Code comment
2021-02-24 11:42:55 +01:00
Laurent Destailleur
4f1f17fedc
Fix GETPOST instead of POST
2021-02-24 11:37:20 +01:00
