Frédéric FRANCE
|
e5402988d9
|
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
|
2020-05-24 17:58:18 +02:00 |
|
Laurent Destailleur
|
6056ed2755
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/holiday/class/holiday.class.php
htdocs/index.php
|
2020-05-24 01:02:08 +02:00 |
|
Laurent Destailleur
|
45ddde6940
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/expensereport/class/expensereport.class.php
htdocs/holiday/class/holiday.class.php
htdocs/index.php
|
2020-05-23 20:18:10 +02:00 |
|
Frédéric FRANCE
|
b41ac00b98
|
add new rule
|
2020-05-21 15:05:19 +02:00 |
|
Frédéric FRANCE
|
f5688b2eec
|
add new rule
|
2020-05-21 01:52:25 +02:00 |
|
altairis
|
55def0248c
|
fix missing rollbacks
|
2020-05-20 14:37:35 +02:00 |
|
Scrutinizer Auto-Fixer
|
8f0e00b4aa
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-05-02 01:39:56 +00:00 |
|
Laurent Destailleur
|
1c70e49695
|
Merge branch 'develop' into 12.0_a23
|
2020-04-27 14:14:13 +02:00 |
|
Laurent Destailleur
|
3ed11f374a
|
Look and feel v12
|
2020-04-24 23:56:57 +02:00 |
|
Laurent Destailleur
|
7bbfd2175d
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/class/fournisseur.commande.dispatch.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/reception/class/reception.class.php
|
2020-04-24 18:58:47 +02:00 |
|
stickler-ci
|
4b58213e5b
|
Fixing style errors.
|
2020-04-23 16:29:36 +00:00 |
|
Marc Guenneugues
|
64d877bc7b
|
Clean line extrafields when deleting supplier order
|
2020-04-23 18:27:06 +02:00 |
|
Laurent Destailleur
|
72c6ac1c72
|
Complete #13708, normalization of code
|
2020-04-23 13:21:39 +02:00 |
|
Scrutinizer Auto-Fixer
|
444c293c01
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-10 08:59:32 +00:00 |
|
Alexandre SPANGARO
|
5528e9ef38
|
Work on split module fournisseur
|
2020-03-24 22:02:58 +01:00 |
|
Laurent Destailleur
|
62fefab5ac
|
Standardize color of status
|
2020-03-24 19:06:37 +01:00 |
|
Laurent Destailleur
|
56d6c4691f
|
FIX #13382 Note will be concat to private note
|
2020-03-18 21:06:36 +01:00 |
|
Laurent Destailleur
|
fc05e8d768
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/bookmarks/bookmarks.lib.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/langs/en_US/other.lang
|
2020-03-11 18:03:15 +01:00 |
|
Laurent Destailleur
|
4903287204
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/core/boxes/box_commandes.php
htdocs/fourn/class/fournisseur.commande.class.php
|
2020-03-11 17:04:28 +01:00 |
|
Laurent Destailleur
|
c9b715b7ad
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2020-03-11 17:01:31 +01:00 |
|
Laurent Destailleur
|
7afbb5ce9c
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2020-03-11 17:00:01 +01:00 |
|
Laurent Destailleur
|
467dc2da7a
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2020-03-11 16:59:35 +01:00 |
|
Laurent Destailleur
|
4bdf10c995
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2020-03-11 16:44:03 +01:00 |
|
atm-lena
|
20aa51f26b
|
FIX - Clone Fourn Command, add line's extrafields Part 2
|
2020-03-11 15:26:49 +01:00 |
|
atm-lena
|
35f32391a0
|
FIX - Clone Fourn Command, add line's extrafields
|
2020-03-10 14:46:15 +01:00 |
|
Laurent Destailleur
|
7866f89585
|
Merge pull request #13260 from atm-quentin/FIX_ecm_files
FIX ecm_files didnt match cause document ref contained "/"
|
2020-03-03 23:09:02 +01:00 |
|
atm-quentin
|
9446138951
|
FIX ecm_files didnt match cause document ref contained "/"
|
2020-03-03 12:07:18 +01:00 |
|
Scrutinizer Auto-Fixer
|
e44865d8b5
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-02-21 16:53:37 +00:00 |
|
Laurent Destailleur
|
a4f13194c3
|
Merge pull request #12503 from atm-greg/New_Supplier_Packaging
NEW Experiment supplier packaging with option PRODUCT_USE_SUPPLIER_PACKAGING: Using price according to the minimum quantity
|
2020-02-13 10:50:56 +01:00 |
|
Laurent Destailleur
|
7f146111d2
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-02-11 19:20:46 +01:00 |
|
Laurent Destailleur
|
aa9ffbba05
|
Fix missing fields property
|
2020-02-11 19:18:36 +01:00 |
|
atm-greg
|
f8ffdea5ae
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_Supplier_Packaging
|
2020-02-06 09:59:42 +01:00 |
|
Scrutinizer Auto-Fixer
|
5fda829023
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-01-30 00:48:28 +00:00 |
|
Laurent Destailleur
|
0f2141269a
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/supplier_proposal/class/supplier_proposal.class.php
|
2020-01-25 14:43:57 +01:00 |
|
Laurent Destailleur
|
09f809f347
|
FIX #12913
|
2020-01-25 14:03:24 +01:00 |
|
Laurent Destailleur
|
2d07a08e55
|
Fix init of specimen
|
2020-01-21 00:22:57 +01:00 |
|
Laurent Destailleur
|
80483fc085
|
Fix init of specimen
|
2020-01-21 00:20:03 +01:00 |
|
Laurent Destailleur
|
65fef47bdb
|
Enable new pdf templates as stable
|
2020-01-20 01:05:30 +01:00 |
|
Laurent Destailleur
|
0873f2fec9
|
Fix $user not defined
|
2020-01-18 16:16:17 +01:00 |
|
Laurent Destailleur
|
98eda68afb
|
Fix linkg to public notes
|
2020-01-15 19:49:45 +01:00 |
|
Laurent Destailleur
|
8059463941
|
Debug v11
|
2019-12-20 17:54:54 +01:00 |
|
Laurent Destailleur
|
838633d0de
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/api/class/api_setup.class.php
htdocs/compta/facture/card.php
htdocs/compta/stats/index.php
htdocs/core/actions_massactions.inc.php
htdocs/install/upgrade2.php
htdocs/loan/card.php
htdocs/loan/document.php
htdocs/loan/info.php
htdocs/loan/note.php
htdocs/loan/schedule.php
htdocs/product/list.php
htdocs/ticket/card.php
htdocs/user/class/user.class.php
|
2019-12-14 14:53:49 +01:00 |
|
Frédéric FRANCE
|
2136499c67
|
The variable $query seems to be never defined
|
2019-12-12 20:11:18 +01:00 |
|
gauthier
|
a0aa51fe0c
|
FIX : CommandeFournisseurLigne update function must not be able to return other value than 1 if success
|
2019-12-12 16:46:25 +01:00 |
|
Laurent Destailleur
|
92070fa491
|
Fix name of variable $trigger_name into $triggersendname
|
2019-12-02 09:38:16 +01:00 |
|
stickler-ci
|
5d051cc901
|
Fixing style errors.
|
2019-11-25 07:08:22 +00:00 |
|
atm-greg
|
5af9784dc9
|
fix update line
|
2019-11-25 07:40:29 +01:00 |
|
atm-greg
|
89dd04aa07
|
implement on supplier_order
|
2019-11-23 19:05:49 +01:00 |
|
Scrutinizer Auto-Fixer
|
ac40dd8bbe
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:35:39 +00:00 |
|
Laurent Destailleur
|
9e9d88f28c
|
Fix stats on tickets
|
2019-11-05 16:06:08 +01:00 |
|