Laurent Destailleur
|
cd041c9ea1
|
Clean code
|
2022-06-03 02:41:00 +02:00 |
|
Laurent Destailleur
|
0bb7defa88
|
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/langs/en_US/errors.lang
htdocs/projet/card.php
|
2022-06-01 16:04:11 +02:00 |
|
Laurent Destailleur
|
64a683c8e7
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
htdocs/projet/tasks/task.php
|
2022-05-31 14:33:19 +02:00 |
|
kamel
|
79462c43fa
|
FIX: Fix get origin from other than supplier proposal when add a new supplier proposal
|
2022-05-24 15:13:19 +02:00 |
|
Laurent Destailleur
|
7fd3bb0aae
|
Remove deprecated code
|
2022-05-19 12:08:03 +02:00 |
|
Laurent Destailleur
|
a483af70df
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/contrat/index.php
|
2022-05-17 23:27:11 +02:00 |
|
Laurent Destailleur
|
c475789433
|
Debug v16
|
2022-05-17 23:23:50 +02:00 |
|
Laurent Destailleur
|
4de50da0dd
|
Repare code to forbidden var_dump() into code
|
2022-05-17 14:55:38 +02:00 |
|
Laurent Destailleur
|
fa7254be9a
|
Fix picto and perm
|
2022-05-03 17:05:14 +02:00 |
|
Laurent Destailleur
|
c96e3bdddf
|
PHP v8 compatibility
|
2022-04-30 19:50:20 +02:00 |
|
Laurent Destailleur
|
147e61472c
|
Clean code: Remove all   entities.
|
2022-04-29 13:10:28 +02:00 |
|
Gauthier PC portable 024
|
83e8e07416
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop
|
2022-04-08 09:25:08 +02:00 |
|
Laurent Destailleur
|
26c3e235cf
|
Merge pull request #19459 from frederic34/productmerge
can merge products
|
2022-04-07 15:02:03 +02:00 |
|
Laurent Destailleur
|
4693ef42bd
|
Enhance responsive
|
2022-04-07 11:18:56 +02:00 |
|
Laurent Destailleur
|
5b91ae062f
|
All triggers with a name XXX_UPDATE have been renamed XXX_MODIFY for
code consistency purpose.
|
2022-04-02 10:31:58 +02:00 |
|
Laurent Destailleur
|
bc938d86ba
|
NEW Can enter price with tax for predefined products on purchase objects
|
2022-03-26 11:22:54 +01:00 |
|
Gauthier PC portable 024
|
5b715978e4
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop
|
2022-03-10 10:02:57 +01:00 |
|
Frédéric FRANCE
|
018fc53554
|
Merge remote-tracking branch 'upstream/develop' into productmerge
|
2022-02-27 08:40:01 +01:00 |
|
Laurent Destailleur
|
e96061dd18
|
Fix phpunit SecurityTest
|
2022-02-22 23:46:57 +01:00 |
|
Frédéric FRANCE
|
b277ab9ee3
|
Merge remote-tracking branch 'upstream/develop' into productmerge
|
2022-02-22 21:49:17 +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
|
c8640f329e
|
add missing global
|
2022-02-15 18:31:05 +01:00 |
|
Frédéric FRANCE
|
0ba912b1e5
|
add missing global
|
2022-02-15 18:14:44 +01:00 |
|
Frédéric FRANCE
|
9dc2cc82cb
|
Update supplier_proposal.class.php
|
2022-02-15 17:07:43 +01:00 |
|
Laurent Destailleur
|
045cd5e810
|
Fix phpcs
|
2022-01-30 02:05:07 +01:00 |
|
Laurent Destailleur
|
05ef2c714e
|
Update supplier_proposal.class.php
|
2022-01-28 18:54:47 +01:00 |
|
Jay Yeo
|
8c403655a7
|
FIX supplier_proposal when line update price U.P change 0 modify
|
2022-01-28 18:54:38 +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 |
|
Laurent Destailleur
|
13510b9929
|
Clean sortfield, sortorder
|
2022-01-13 11:17:25 +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
|
0387b9922e
|
FIX error message on sqlfilter in API
|
2021-12-20 20:49:32 +01:00 |
|
Laurent Destailleur
|
98ddfbf792
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
htdocs/compta/facture/info.php
htdocs/compta/facture/list.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/fourn/facture/list.php
htdocs/mrp/mo_movements.php
htdocs/product/stock/movement_card.php
htdocs/product/stock/movement_list.php
htdocs/product/stock/replenishorders.php
htdocs/reception/card.php
htdocs/supplier_proposal/list.php
|
2021-12-19 00:17:37 +01:00 |
|
Laurent Destailleur
|
39b4586957
|
Merge pull request #19624 from 1ocate/FIX_05_author_searching_include_first_and_last_name
Fix author searching include first and last name
|
2021-12-16 17:09:44 +01:00 |
|
Laurent Destailleur
|
f8e6befe35
|
Fix link on user
|
2021-12-16 16:47:11 +01:00 |
|
Jay Yeo
|
41e4e70c6e
|
Fix author searching include first and last name
|
2021-12-16 16:28:45 +07:00 |
|
Jay Yeo
|
7c1879a11a
|
Fix author searching include first and last name
|
2021-12-15 16:52:57 +07:00 |
|
Laurent Destailleur
|
bb1d5daa82
|
css
|
2021-12-12 23:47:40 +01:00 |
|
Frédéric FRANCE
|
5e2dcf322c
|
Update supplier_proposal.class.php
|
2021-11-23 22:17:05 +01:00 |
|
Frédéric FRANCE
|
bc4ce6725a
|
fix undefined variable $result
|
2021-11-23 22:14:25 +01:00 |
|
Frédéric FRANCE
|
799862362d
|
can merge products but experimental
|
2021-11-23 22:03:46 +01:00 |
|
Frédéric FRANCE
|
429e5cf517
|
can merge products but experimental
|
2021-11-23 22:02:55 +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
|
9840c1e0fa
|
Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop
|
2021-11-22 16:17:55 +01:00 |
|
Gauthier PC portable 024
|
e75b6ae0b4
|
FIX : it's better with an input number
|
2021-11-22 16:13:46 +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 |
|