Frédéric FRANCE
|
b277ab9ee3
|
Merge remote-tracking branch 'upstream/develop' into productmerge
|
2022-02-22 21:49:17 +01:00 |
|
Laurent Destailleur
|
cebada1966
|
Merge pull request #20071 from frederic34/patch-1
NEW Hook getNomUrl available everywhere in tooltip of ref links
|
2022-02-16 20:36:02 +01:00 |
|
Laurent Destailleur
|
aad292b41b
|
Merge pull request #20074 from altairisfr/fix_parentline_13.0
More generic management of parentline
|
2022-02-16 20:25:04 +01:00 |
|
Frédéric FRANCE
|
eb77f10d7b
|
Merge remote-tracking branch 'upstream/develop' into productmerge
|
2022-02-15 19:11:24 +01:00 |
|
Frédéric FRANCE
|
935482ee22
|
uniformize
|
2022-02-15 19:04:18 +01:00 |
|
Frédéric FRANCE
|
0ba912b1e5
|
add missing global
|
2022-02-15 18:14:44 +01:00 |
|
Frédéric FRANCE
|
09c9b28b57
|
Update commande.class.php
|
2022-02-15 11:02:22 +01:00 |
|
Frédéric FRANCE
|
c90f9b5681
|
add hook in order tooltip
|
2022-02-15 10:51:06 +01:00 |
|
Christophe Battarel
|
01ef9b64ee
|
fix parent line on create with no originid
|
2022-02-15 10:34:10 +01:00 |
|
iouston
|
4808442bc8
|
keep the default value for target in getnomurl to ''
|
2022-02-15 09:34:51 +01:00 |
|
iouston
|
993e0d852c
|
fix parameter name
|
2022-02-04 15:01:32 +01:00 |
|
stickler-ci
|
e8801bd7fc
|
Fixing style errors.
|
2022-02-04 13:42:07 +00:00 |
|
iouston
|
95aabd6ae3
|
add target attribute on getNomUrl
|
2022-02-04 14:38:34 +01:00 |
|
Gauthier PC portable 024
|
3abe391f65
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop
|
2022-01-28 15:08:02 +01:00 |
|
ptibogxiv
|
928075bbf6
|
fix error in commande.class.php
|
2022-01-26 20:13:10 +01:00 |
|
Laurent Destailleur
|
8dbadc0aa8
|
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2022-01-24 14:12:06 +01:00 |
|
Laurent Destailleur
|
6b5c0769b8
|
FIX #19786
|
2022-01-24 14:09:53 +01:00 |
|
ptibogxiv
|
b89947ff7c
|
Update commande.class.php
|
2022-01-20 19:58:31 +01:00 |
|
ptibogxiv
|
56dd41324c
|
Update commande.class.php
|
2022-01-20 19:57:48 +01:00 |
|
ptibogxiv
|
accb0deb29
|
New support user_modif in order
|
2022-01-16 00:13:14 +01:00 |
|
Gauthier PC portable 024
|
6799d48944
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop
|
2022-01-11 09:59:25 +01:00 |
|
Laurent Destailleur
|
19efa37e4b
|
Fix default value #19562
|
2021-12-19 20:55:24 +01:00 |
|
Frédéric FRANCE
|
d601f62194
|
can merge products but experimental
|
2021-11-23 21:38:29 +01:00 |
|
Gauthier PC portable 024
|
2c2f456827
|
Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop
|
2021-11-23 11:10:01 +01:00 |
|
Gauthier PC portable 024
|
74f5c092dc
|
FIX : use $linecount = count($this->lines);
|
2021-11-23 10:44:43 +01:00 |
|
Gauthier PC portable 024
|
72614ecc0d
|
Merge branch 'NEW/addline_with_position_choice_develop' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop
|
2021-11-16 16:43:01 +01:00 |
|
Gauthier PC portable 024
|
375dcf7028
|
FIX : dev name
|
2021-11-16 16:42:48 +01:00 |
|
stickler-ci
|
19171d4f8e
|
Fixing style errors.
|
2021-11-16 15:15:55 +00:00 |
|
Gauthier PC portable 024
|
9d41c1390d
|
Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop
|
2021-11-16 14:20:24 +01:00 |
|
Gauthier PC portable 024
|
1e0d7d92a9
|
NEW : addline with position choice when MAIN_VIEW_LINE_NUMBER is enabled
|
2021-11-16 14:09:18 +01:00 |
|
Marc de Lima Lucio
|
7e059c0a22
|
NEW: deposit payment terms: futureproof evolutions by storing field as a string
|
2021-10-28 16:53:28 +02:00 |
|
Marc de Lima Lucio
|
668088a63f
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms
|
2021-10-28 15:54:18 +02:00 |
|
Frédéric FRANCE
|
46c4f28478
|
fix multiple warnings
|
2021-10-22 22:15:59 +02:00 |
|
Marc de Lima Lucio
|
47deb64f09
|
FIX: deposit payment terms: sql syntax error
|
2021-10-05 14:19:47 +02:00 |
|
Marc de Lima Lucio
|
004b52f590
|
NEW: deposit payment terms: add field into CRUD methods
|
2021-09-29 12:05:38 +02:00 |
|
Laurent Destailleur
|
e15277bb6c
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-09-28 17:23:07 +02:00 |
|
Laurent Destailleur
|
fc56b88a1f
|
FIX select list of orders not complete when field type of company is on
|
2021-09-28 13:44:42 +02:00 |
|
Laurent Destailleur
|
ee066ad725
|
Cast sql var
|
2021-09-03 21:25:43 +02:00 |
|
Laurent Destailleur
|
2dd91bf312
|
Clean code
|
2021-08-27 23:36:06 +02:00 |
|
Laurent Destailleur
|
46d993c9a6
|
Clean code
|
2021-08-27 22:42:04 +02:00 |
|
Laurent Destailleur
|
8485fee5f9
|
Cast numeric into on sql request
|
2021-08-23 19:33:24 +02:00 |
|
Laurent Destailleur
|
d4b5ee6c85
|
Fix cast into variable into sql request.
|
2021-08-23 17:41:11 +02:00 |
|
Laurent Destailleur
|
58ca982e55
|
Fix trans
|
2021-08-04 14:01:57 +02:00 |
|
Laurent Destailleur
|
f6efe51032
|
Fix trouble with product id = -1
|
2021-07-04 21:02:02 +02:00 |
|
Francis Appels
|
1b7b45d72a
|
Merge remote-tracking branch 'Dolibarr/14.0' into 14_fix_php8_part2
|
2021-06-29 16:56:48 +02:00 |
|
Francis Appels
|
b8f5dc74d7
|
Some order php 8 warning
|
2021-06-29 16:30:36 +02:00 |
|
Laurent Destailleur
|
25c6b64b1e
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
htdocs/core/modules/delivery/doc/pdf_storm.modules.php
htdocs/core/modules/reception/doc/pdf_squille.modules.php
htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
|
2021-06-29 15:58:26 +02:00 |
|
Laurent Destailleur
|
1cf3408f5b
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/contact/class/contact.class.php
|
2021-06-29 15:52:39 +02:00 |
|
Francis Appels
|
69affc5df5
|
Fix php 8 warnings
|
2021-06-28 16:25:16 +02:00 |
|
Maxime Kohlhaas
|
c3cbd29542
|
Fix #17836 : order delay warning in list was wrong, date_commande is deprecated
|
2021-06-27 09:04:47 +02:00 |
|