Laurent Destailleur
|
f7f20df323
|
Merge pull request #10891 from atm-greg/Add_hook_on_replenish
Add hook on replenish
|
2019-03-21 18:23:06 +01:00 |
|
Laurent Destailleur
|
89087c6847
|
Merge pull request #10800 from atm-quentin/FIX_wrong_vat_deposit_invoice
Wrong vat if deposit from propal with multiple vat
|
2019-03-18 11:14:11 +01:00 |
|
Laurent Destailleur
|
ae35c982af
|
Merge pull request #9652 from atm-gauthier/7.0_fix_round_debitcredit
FIX : need to round with 2 decimals to avoid movements not correctly balanced
|
2019-03-16 14:27:03 +01:00 |
|
Laurent Destailleur
|
4bb45ad1c1
|
Merge pull request #10824 from atm-gauthier/7.0_fix_nocreateline_deposit_if_amount_zero
FIX : when we create deposit with multi tva, we mustn't add line if a…
|
2019-03-15 19:16:56 +01:00 |
|
Laurent Destailleur
|
b33c366b02
|
Update card.php
|
2019-03-15 19:16:49 +01:00 |
|
Laurent Destailleur
|
482a37a2c9
|
Merge pull request #10850 from atm-ph/fix_7.0_var_name
Fix var name
|
2019-03-15 19:12:55 +01:00 |
|
atm-ph
|
2da60fb885
|
Fix var name
|
2019-03-15 15:15:03 +01:00 |
|
Laurent Destailleur
|
6c2cad3d48
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/core/lib/security.lib.php
|
2019-03-15 11:00:00 +01:00 |
|
Laurent Destailleur
|
8711e51bce
|
Merge pull request #10841 from atm-gauthier/6.0_notest_tab_documents_on_expensereport
FIX : no need to test anything to display documents tabs on expense report
|
2019-03-15 10:56:53 +01:00 |
|
gauthier
|
8375b47e74
|
FIX : in fact expensereport must be in $check array
|
2019-03-15 10:21:50 +01:00 |
|
Laurent Destailleur
|
5ec8adb7f5
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2019-03-14 18:48:35 +01:00 |
|
gauthier
|
3fb6978bc8
|
FIX : no need to test anything to display documents tabs on expense report
|
2019-03-14 17:36:49 +01:00 |
|
Laurent Destailleur
|
eab1e13343
|
Merge pull request #10839 from atm-gauthier/6.0_fix_useless_join
FIX : useless join
|
2019-03-14 17:12:38 +01:00 |
|
gauthier
|
885797b748
|
FIX : useless join
|
2019-03-14 17:00:51 +01:00 |
|
gauthier
|
a524bbc5c6
|
FIX : when we create deposit with multi tva, we mustn't add line if amount = 0 (example when we have a 100% reduc on one of origin invoice line)
|
2019-03-13 15:59:41 +01:00 |
|
atm-quentin
|
ab781c32c7
|
Wrong vat if deposit from propal with multiple vat
|
2019-03-11 11:28:25 +01:00 |
|
Laurent Destailleur
|
520387c03d
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/holiday/card.php
|
2019-03-09 00:01:29 +01:00 |
|
Laurent Destailleur
|
233bd4374a
|
Fix phpcs
|
2019-03-08 19:52:26 +01:00 |
|
Laurent Destailleur
|
2ae3d75df4
|
Merge pull request #10752 from atm-gauthier/7.0_fix_fourninvoice_specialcode
FIX : we need to keep originline special_code
|
2019-03-07 12:29:00 +01:00 |
|
Laurent Destailleur
|
e3fb228a4d
|
Update fournisseur.facture.class.php
|
2019-03-07 12:28:19 +01:00 |
|
gauthier
|
0ff2905180
|
FIX : we need to keep originline special_code
|
2019-03-06 12:10:24 +01:00 |
|
Laurent Destailleur
|
22bb62d900
|
Merge pull request #10737 from atm-gauthier/6.0_fix_wrong_redirect_link
FIX : wrong redirect link on holiday refuse
|
2019-03-05 18:43:57 +01:00 |
|
Laurent Destailleur
|
3db8218cba
|
Merge pull request #10745 from frederic34/patch-6
add session newtoken
|
2019-03-05 18:41:50 +01:00 |
|
Frédéric FRANCE
|
1bbf6737ec
|
add session newtoken
|
2019-03-05 15:27:31 +01:00 |
|
gauthier
|
dada8c8ff5
|
FIX : wrong redirect link on holiday refuse
|
2019-03-04 17:23:29 +01:00 |
|
Laurent Destailleur
|
76dd9e42d2
|
Merge pull request #10726 from frederic34/patch-3
Update DolibarrModules.class.php
|
2019-03-04 16:05:06 +01:00 |
|
Frédéric FRANCE
|
3037e4a157
|
Update DolibarrModules.class.php
|
2019-03-02 20:49:53 +01:00 |
|
Laurent Destailleur
|
a2eefab696
|
Merge pull request #10714 from ATM-Marc/FIX_7.0_export_actioncomm
FIX: actioncomm export: ORDER BY clause / event type filter
|
2019-03-02 18:44:34 +01:00 |
|
Marc de Lima Lucio
|
b96ac794e9
|
FIX: actioncomm export: ORDER BY clause is in wrong export property + event type filter does not work
|
2019-02-28 16:15:32 +01:00 |
|
Laurent Destailleur
|
c1fa48889e
|
Merge pull request #10677 from frederic34/patch-6
fix #10385
|
2019-02-24 20:46:04 +01:00 |
|
Frédéric FRANCE
|
2ad91213b2
|
Update combinations.php
|
2019-02-24 12:09:57 +01:00 |
|
Laurent Destailleur
|
f2a73eecf2
|
Merge pull request #10645 from atm-gauthier/7.0_fix_feature_not_finished
FIX : function sendEmailsReminder isn't completely developed, then MA…
|
2019-02-23 15:01:44 +01:00 |
|
gauthier
|
58d82eb477
|
FIX : function sendEmailsReminder isn't completely developed, then MAIN_FEATURES_LEVEL must be 2 to "use" it
|
2019-02-21 11:08:55 +01:00 |
|
Laurent Destailleur
|
04b0216277
|
Merge pull request #10548 from aspangaro/7.0_accountancy_multicomp_movement
FIX: Accountancy - Add transaction with multicompany use only the first entity
|
2019-02-12 13:19:00 +01:00 |
|
Alexandre SPANGARO
|
2dc4edb68c
|
FIX: Accountancy - Add transaction with multicompany use all the time 1st entity
|
2019-02-11 11:36:12 +01:00 |
|
gauthier
|
2142ccee8a
|
FIX : better method
|
2019-02-08 15:17:40 +01:00 |
|
Laurent Destailleur
|
4997b5968f
|
Merge pull request #10506 from ATM-Marc/FIX_7.0_parent_line
FIX: line edit template: keep fk_parent_line
|
2019-02-08 09:52:21 +01:00 |
|
Laurent Destailleur
|
76b021d061
|
Merge pull request #10505 from ATM-Marc/FIX_7.0_expedition_status
FIX: expedition: reset status on rollback
|
2019-02-08 09:46:14 +01:00 |
|
Marc de Lima Lucio
|
428efa9227
|
FIX: line edit template: keep fk_parent_line
|
2019-02-05 12:02:49 +01:00 |
|
Marc de Lima Lucio
|
64739098ae
|
FIX: expedition: reset status on rollback + replace hardcoded status with const
|
2019-02-05 11:58:49 +01:00 |
|
Laurent Destailleur
|
dbf7ae4c25
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2019-02-01 15:56:58 +01:00 |
|
Laurent Destailleur
|
452dfafd32
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2019-02-01 15:56:47 +01:00 |
|
Laurent Destailleur
|
bff2f33022
|
Merge pull request #10404 from atm-john/6.0_fix_supplier_order_line_fetch
Fix fetch test
|
2019-02-01 15:56:26 +01:00 |
|
Laurent Destailleur
|
f00271fee6
|
Merge pull request #10467 from atm-gauthier/7.0_fix_nextnumref
FIX : need an order by in case we found other invoice with same number but not same date
|
2019-02-01 15:38:16 +01:00 |
|
Laurent Destailleur
|
a08a0b4c1d
|
Merge pull request #10469 from atm-gauthier/7.0_fix_wrong_test_enabled
FIX : wrong test enabled
|
2019-02-01 15:34:55 +01:00 |
|
gauthier
|
caa937660d
|
FIX : wrong test enabled
|
2019-01-31 12:43:39 +01:00 |
|
gauthier
|
09ba059c21
|
FIX : need an order by in case we found other invoice with same number but not same date
|
2019-01-31 11:03:06 +01:00 |
|
Laurent Destailleur
|
484b4371c1
|
FIX XSS
Conflicts:
htdocs/viewimage.php
|
2019-01-31 10:19:23 +01:00 |
|
Laurent Destailleur
|
231395dab8
|
Merge pull request #10398 from atm-john/fix_trigger
Fix missing trigger
|
2019-01-30 18:53:10 +01:00 |
|
Laurent Destailleur
|
104364ed02
|
Merge pull request #10459 from atm-gauthier/7.0_FIX_cmd_fourn_enabled
FIX : $conf->fournisseur->commande->enabled doesn't exist, we must use $conf->fournisseur->enabled
|
2019-01-30 15:51:09 +01:00 |
|