Frédéric FRANCE
|
d25fa61998
|
return comment
|
2018-08-14 13:14:55 +02:00 |
|
Frédéric FRANCE
|
a0a6afc224
|
return comment
|
2018-08-14 12:23:10 +02:00 |
|
Laurent Destailleur
|
7c6f41e04f
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-08-13 23:58:18 +02:00 |
|
Laurent Destailleur
|
fa4a12be41
|
Merge pull request #9208 from ptibogxiv/patch-33
fix connect mode for v8 release
|
2018-08-13 23:56:42 +02:00 |
|
Laurent Destailleur
|
b98ee516d0
|
Merge pull request #9235 from grandoc/new_branch_13_08_2018
standardize code
|
2018-08-13 23:47:00 +02:00 |
|
Laurent Destailleur
|
b4a4ab4fa0
|
Merge pull request #9233 from grandoc/new_branch_12_08_2018
standardize code
|
2018-08-13 23:46:37 +02:00 |
|
Laurent Destailleur
|
3039e0e5ef
|
Merge pull request #9237 from CelineDesign/develop
NEW #9236 Allow to import expedtion lines via API
|
2018-08-13 23:44:26 +02:00 |
|
Laurent Destailleur
|
e325da9339
|
Merge pull request #9244 from delcroip/patch-16
Fix #9205 quote in Label/number on supplier payment
|
2018-08-13 23:41:02 +02:00 |
|
Laurent Destailleur
|
549462574e
|
Merge pull request #9241 from frederic34/patch-11
Update modules_holiday.php
|
2018-08-13 23:40:05 +02:00 |
|
Laurent Destailleur
|
5e762fe712
|
Fix cloning website switch on new web site
|
2018-08-13 23:22:20 +02:00 |
|
delcroix Patrick
|
cbdd1949df
|
Fix #9205 quote in Label/number on supplier payment
# Fix #9205 #9205
the num_paiement wasn't escaped, not sure it's an real issue but it was reported here
https://www.dolibarr.fr/forum/8-mise-a-jour/62340-message-erreur-suite-mise-a-jour#99408
|
2018-08-13 20:39:20 +02:00 |
|
Frédéric FRANCE
|
0b5a87a443
|
Update modules_holiday.php
|
2018-08-13 17:25:41 +02:00 |
|
Sébastien Couragier
|
e58c03d7b9
|
#9236 Allow to import expedtion lines via API
|
2018-08-13 11:59:55 +02:00 |
|
Philippe GRAND
|
e9adc9fc8e
|
Standardize code
|
2018-08-13 11:25:48 +02:00 |
|
Philippe GRAND
|
f1f64db4dc
|
standardize code
|
2018-08-13 10:20:21 +02:00 |
|
Laurent Destailleur
|
6a8ed56c3d
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-08-13 01:23:43 +02:00 |
|
Laurent Destailleur
|
31c42c9a32
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/societe/canvas/actions_card_common.class.php
|
2018-08-13 01:23:03 +02:00 |
|
Laurent Destailleur
|
7cd24c389d
|
Fix firstname/lastname
|
2018-08-13 01:21:23 +02:00 |
|
Laurent Destailleur
|
21555a7435
|
Fix firstname/lastname
|
2018-08-13 01:10:51 +02:00 |
|
Philippe GRAND
|
dc3a2ac26e
|
standardize code
|
2018-08-12 22:40:47 +02:00 |
|
Laurent Destailleur
|
d09850522b
|
Fix migration
|
2018-08-12 22:27:54 +02:00 |
|
Laurent Destailleur
|
9fc5d39d07
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-08-12 20:09:36 +02:00 |
|
Laurent Destailleur
|
dc8c4402ee
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-08-12 20:09:22 +02:00 |
|
Laurent Destailleur
|
0a1c6e7194
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/comm/propal/list.php
htdocs/compta/facture/list.php
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
|
2018-08-12 20:08:20 +02:00 |
|
Laurent Destailleur
|
2d571acc03
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/commande/list.php
|
2018-08-12 19:25:44 +02:00 |
|
Laurent Destailleur
|
30b4d88428
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/compta/facture/list.php
htdocs/product/reassort.php
htdocs/societe/list.php
|
2018-08-12 19:23:45 +02:00 |
|
Laurent Destailleur
|
61a5be6e2a
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-08-12 19:19:21 +02:00 |
|
Laurent Destailleur
|
234b0d3120
|
Merge pull request #9230 from ATM-Nicolas/fix_withdraw_pagination
FIX : Pagination on withdraw request list
|
2018-08-12 19:18:57 +02:00 |
|
Laurent Destailleur
|
b81b6b651f
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-08-12 19:17:26 +02:00 |
|
Jan
|
ddbfaf0788
|
wrong position of counter reset
extrafields will work now ;) and not the first product gets the last extrafields values
|
2018-08-12 19:16:49 +02:00 |
|
Laurent Destailleur
|
1ca17fb781
|
Merge pull request #9229 from Conspir3D/patch-2
fix: wrong position of counter reset
|
2018-08-12 19:16:15 +02:00 |
|
Laurent Destailleur
|
b11d5c2f71
|
Merge pull request #9228 from atm-florian/8.0
fix : remove comment on commit
|
2018-08-12 19:13:07 +02:00 |
|
Laurent Destailleur
|
1b20d6feab
|
Merge pull request #9214 from atm-greg/Add_supplier_product_description
NEW Can record the supplier product description
|
2018-08-12 18:56:27 +02:00 |
|
Laurent Destailleur
|
be7a764de7
|
Merge pull request #9202 from atm-florian/7.0
fix bad use of test_sql_and_script_inject return int not value tested
|
2018-08-12 18:24:54 +02:00 |
|
Laurent Destailleur
|
2f559a7edb
|
Merge pull request #9199 from atm-quentin/FIX_hook_update_price
NEW Add hook changeRoundingMode in update_price
|
2018-08-12 18:17:52 +02:00 |
|
Laurent Destailleur
|
7f797668c9
|
Merge pull request #9186 from atm-florian/6.0
fix : odt project and task extrafields management
|
2018-08-12 18:15:02 +02:00 |
|
Laurent Destailleur
|
35c22b231f
|
Merge pull request #9223 from grandoc/new_branch_08_08_2018
Standardize
|
2018-08-12 18:12:18 +02:00 |
|
Laurent Destailleur
|
56d8935976
|
Merge pull request #9181 from ATM-Nicolas/fix_dolGetFirstLastname
FIX : Wrong position of firstname lastname
|
2018-08-12 18:11:36 +02:00 |
|
Laurent Destailleur
|
6954ab00f9
|
Update functions.lib.php
|
2018-08-12 18:11:27 +02:00 |
|
Laurent Destailleur
|
4c269f321c
|
Merge pull request #9222 from pa-de-solminihac/develop
FIX massaction builddoc: include PDF files created from an ODT template
|
2018-08-12 18:02:55 +02:00 |
|
Laurent Destailleur
|
9e170c89b8
|
Update actions_massactions.inc.php
Try another change to include PDF generated from ODX without including files uploaded manually.
|
2018-08-12 18:02:40 +02:00 |
|
Laurent Destailleur
|
3835749b5d
|
Merge pull request #9227 from frederic34/phpcsv3
Upgrade Phpcs to v3
|
2018-08-12 17:47:12 +02:00 |
|
Laurent Destailleur
|
8d03d58d54
|
Merge pull request #9209 from ptibogxiv/patch-34
Fix 3D secure
|
2018-08-12 17:42:42 +02:00 |
|
Laurent Destailleur
|
9124d5c6a5
|
Merge pull request #9231 from atm-gauthier/7.0_fix_notice
FIX : global $mysoc missing (to avoid php notice on lines 279, 280 & 281
|
2018-08-12 17:36:39 +02:00 |
|
Laurent Destailleur
|
3d4d42462c
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2018-08-12 16:30:21 +02:00 |
|
Laurent Destailleur
|
12e21b4886
|
FIX update extrafields
|
2018-08-12 16:29:26 +02:00 |
|
gauthier
|
391230babc
|
FIX : global $mysoc missing (to avoid php notice on lines 279, 280 & 281)
|
2018-08-10 15:39:49 +02:00 |
|
ATM-Nicolas
|
d8d54d246c
|
FIX : Pagination on withdraw request list
|
2018-08-10 15:05:21 +02:00 |
|
Laurent Destailleur
|
39f4eae07e
|
Fix look and feel v8
|
2018-08-09 23:11:49 +02:00 |
|
Laurent Destailleur
|
1af9700a58
|
Fix responsive
|
2018-08-09 22:52:43 +02:00 |
|