Laurent Destailleur
a2dd80bcc8
FIX Navigation in object fails to find the next ref in some cases
2020-07-26 21:07:39 +02:00
Laurent Destailleur
0d24b979c1
Fix phpcs
2020-07-11 01:20:20 +02:00
Laurent Destailleur
bb056fc811
Fix bad return value
2020-07-10 03:02:49 +02:00
Laurent Destailleur
f2c84fba3d
Merge pull request #14202 from pstructures/PSdevelop
...
Added Hook to showOptionals Function
2020-07-10 02:54:05 +02:00
Laurent Destailleur
96c583b84e
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-10 02:28:34 +02:00
Laurent Destailleur
b8721e0c64
FIX Change position of line in BOM
2020-07-09 16:00:15 +02:00
Matt Sidnell
39104009ef
Updated to match inline with code received from fork
2020-07-08 14:25:37 +01:00
Matt Sidnell
580b9db3e7
Updated Hook in showOptionals function to allow the manipulation of optional fields on cards etc...
2020-07-08 14:20:59 +01:00
Laurent Destailleur
344098fe23
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contrat/card.php
htdocs/core/actions_fetchobject.inc.php
htdocs/langs/fr_FR/contracts.lang
htdocs/langs/fr_FR/loan.lang
htdocs/langs/fr_FR/stocks.lang
2020-07-05 13:01:00 +02:00
Laurent Destailleur
b726e96f4b
FIX Update form erased extrafields that were hidden
2020-07-04 17:09:20 +02:00
Laurent Destailleur
1c19c97cf2
FIX missing setup of extrafields for MO
...
FIX all extrafields cleared after update of one of them
FIX Update of extrafields date
FIX Update of extrafiels on draft object
FIX Sql type
Fix trans on BOM
2020-07-04 16:14:53 +02:00
Laurent Destailleur
a44f5376da
Update commonobject.class.php
2020-07-03 00:27:30 +02:00
quentin
d2a364eea8
NEW get all child recursively
2020-07-01 14:10:43 +02:00
Laurent Destailleur
88cf904ced
Fix edit of tag of website
2020-06-30 02:50:58 +02:00
Laurent Destailleur
333d4873c3
Properties ->contactid has been renamed into ->contact_id
2020-06-25 12:17:47 +02:00
Laurent Destailleur
c54294285a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
2020-06-20 12:28:14 +02:00
Laurent Destailleur
2de3eb8ac0
Fix CSS
2020-06-20 00:00:17 +02:00
Laurent Destailleur
4627f06c70
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-16 22:57:50 +02:00
Laurent Destailleur
b7d835eceb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-06-15 16:10:27 +02:00
Laurent Destailleur
1ba03566dc
Fix case of delete contact not correctly implemented.
2020-06-12 02:15:02 +02:00
Laurent Destailleur
ee611fa7a0
Fix bad definition of field for parent
2020-06-11 18:32:05 +02:00
Laurent Destailleur
c289001507
Fix bad definition of field for parent
2020-06-11 18:31:26 +02:00
Laurent Destailleur
ff9312c96a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/card.php
htdocs/compta/prelevement/class/ligneprelevement.class.php
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/line.php
2020-06-08 20:36:54 +02:00
Laurent Destailleur
f4f0da6de2
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-06-08 15:42:27 +02:00
Laurent Destailleur
366f458b39
Show more info to help fix corrupted data
2020-06-08 15:20:01 +02:00
Laurent Destailleur
fd8f8ff4e1
Error message
2020-06-08 15:12:07 +02:00
Laurent Destailleur
6f12488e30
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/filefunc.inc.php
2020-06-07 19:55:48 +02:00
Laurent Destailleur
7d3039d41f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/user/card.php
2020-06-06 23:04:55 +02:00
Laurent Destailleur
b221c65165
Merge
2020-06-06 21:56:23 +02:00
Laurent Destailleur
b386400365
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-06-06 21:52:55 +02:00
Laurent Destailleur
261d0772f8
Update commonobject.class.php
2020-06-06 21:47:27 +02:00
Laurent Destailleur
bb192195f1
Update commonobject.class.php
2020-06-06 21:41:33 +02:00
Laurent Destailleur
87806346c7
Update commonobject.class.php
2020-06-06 21:40:20 +02:00
Laurent Destailleur
d9ac7ab9da
Update commonobject.class.php
2020-06-06 21:37:53 +02:00
Laurent Destailleur
a66926cf08
Update commonobject.class.php
2020-06-06 21:30:08 +02:00
florian HENRY
699557adbe
forget[]
2020-06-04 21:39:23 +02:00
florian HENRY
afafe1a737
forget[]
2020-06-04 21:38:44 +02:00
florian HENRY
29649a1e2a
Merge branch '11.0' of github.com:atm-florian/dolibarr into 11.0
2020-06-04 20:21:17 +02:00
stickler-ci
e9b17aac8d
Fixing style errors.
2020-06-04 18:20:48 +00:00
florian HENRY
b47761e05c
fix comment
2020-06-04 20:20:43 +02:00
florian HENRY
7115bd7033
better fix
2020-06-04 20:14:19 +02:00
Laurent Destailleur
6ddabd51c0
Update commonobject.class.php
2020-06-01 21:03:42 +02:00
bahfir abbes
f2c7db63cf
fix:le résultat de explode est troujours un array
2020-06-01 21:02:45 +02:00
Laurent Destailleur
14a3ab68e6
Merge pull request #14008 from bafbes/abb110217
...
fix:the result of explode is always an array
2020-06-01 21:02:15 +02:00
Laurent Destailleur
d3a769a0ab
Update commonobject.class.php
2020-06-01 21:02:05 +02:00
Laurent Destailleur
0f5eed60a2
Update commonobject.class.php
2020-06-01 20:41:12 +02:00
bahfir abbes
2984edc752
fix:bad database quotation for booleans
2020-06-01 20:40:51 +02:00
Laurent Destailleur
9bf69f11c4
Merge pull request #14010 from bafbes/abb110220
...
fix:bad database quotation for booleans
2020-06-01 20:39:58 +02:00
Laurent Destailleur
2dac87621a
Update commonobject.class.php
2020-06-01 20:39:49 +02:00
Laurent Destailleur
b20e8b9d6b
Merge pull request #14013 from bafbes/abb110222
...
fix:this is required to navigate by id
2020-06-01 20:15:48 +02:00
