Commit Graph

2093 Commits

Author SHA1 Message Date
Laurent Destailleur
11021353da Fix text in payment area of crabe pdf 2018-07-02 11:33:33 +02:00
Laurent Destailleur
da138db528 FIX combo into popup become crazy with IE10
Conflicts:
	htdocs/asset/card.php
	htdocs/modulebuilder/template/myobject_card.php
2018-06-28 12:16:12 +02:00
Laurent Destailleur
7f8570f720 Fix lang loading 2018-06-26 00:48:43 +02:00
Laurent Destailleur
95ee3325fc Part of fix of #8972 2018-06-18 11:11:07 +02:00
Laurent Destailleur
4c2af6fc70 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/html.form.class.php
2018-06-13 23:04:08 +02:00
Laurent Destailleur
c586f2ecf7
Merge pull request #8957 from altatof/FIX_TOTAL_HT_DEVISE
FIX : pu_ht_devise was not converted to numeric so decimals were lost when calculating total_ht_devise
2018-06-13 21:20:42 +02:00
altatof
d42f00bca9 FIX : pu_ht_devise was not converted to numeric so decimals were lost
when clculating total_ht_devise
2018-06-13 16:35:52 +02:00
Regis Houssin
7ce2ebf1a9 Fix: wrong var name 2018-06-07 16:25:47 +02:00
gauthier
77e7932671 FIX : sometimes amounts are identical but php find them different. 2018-06-05 11:33:58 +02:00
Laurent Destailleur
8a64ee2297 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/commande/list.php
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/expedition/class/expedition.class.php
	htdocs/expedition/list.php
	htdocs/societe/card.php
2018-05-25 13:14:58 +02:00
Laurent Destailleur
b25c7e44d3
Merge pull request #8816 from atm-gauthier/6.0_fix_test_before_delete_invoice
FIX : test is_erasable() must be done before call function delete()
2018-05-25 11:05:20 +02:00
Laurent Destailleur
0a581e48d4
Update card.php 2018-05-25 11:04:04 +02:00
atm-quentin
eb224e43a5 FIX missing filters during ordering 2018-05-24 10:41:24 +02:00
Laurent Destailleur
8951c4a7a5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-05-21 23:36:47 +02:00
gauthier
4c3f9d6d5e FIX : test is_erasable() must be done before call function delete() too to avoid delete invoice with &action=delete in url 2018-05-18 15:20:16 +02:00
Laurent Destailleur
24281028b7
Merge pull request #8807 from inoveaconseil/patch-2
Fix missing params for commonGenerateDocument
2018-05-18 11:43:11 +02:00
Laurent Destailleur
e2369dea29 FIX #8722 2018-05-18 11:17:21 +02:00
John
3dd11e1eaf Fix discount id 2018-05-18 11:02:04 +02:00
Inovea Conseil
5804d1d4a3
Fix missing params for commonGenerateDocument
ADD param moreparams for compatibility with commonGenerateDocument
2018-05-17 10:16:44 +02:00
John
b42c87256c Fix_situation_discount_used 2018-05-14 14:55:33 +02:00
Laurent Destailleur
622042e9b2 FIX Max nb of generation of recurring invoice should not show warning 2018-04-16 15:05:35 +02:00
Laurent Destailleur
f1ad3912e7 Fix multicompany compatibility for recurring invoice generation 2018-04-16 14:18:38 +02:00
Laurent Destailleur
79af10fc83 Fix search filters 2018-04-08 13:01:42 +02:00
TuxGasy
47dcc0d5c6 fix notrigger ignored on BILL_CREATE 2018-04-05 18:32:41 +02:00
Laurent Destailleur
227b830aa2 Fix visible rounding of abandonned amount 2018-03-22 09:41:30 +01:00
Laurent Destailleur
07fb29f0c4 Fix var not initialized 2018-03-16 12:18:20 +01:00
Laurent Destailleur
1e6a55745c CSS 2018-03-06 11:54:05 +01:00
Laurent Destailleur
4137e1cc76 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-02 17:56:30 +01:00
Laurent Destailleur
6bb91dd5d2 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-03-02 17:54:42 +01:00
Laurent Destailleur
ee488ed83e FIX invoice creation fails when next date not defined 2018-02-27 20:24:50 +01:00
Laurent Destailleur
75cbc466d5 Fix warning 2018-02-27 19:08:38 +01:00
Laurent Destailleur
1907b9c52d Fix search on dates on template invoices 2018-02-27 19:04:21 +01:00
gauthier
4d05bff780 FIX : if we make a mistake with situation_percent, now we can correct it. before situation_final was always set to 1 and no way to go back 2018-02-27 12:27:25 +01:00
Laurent Destailleur
0cc84ab92f FIX Missing restore_lastsearch_values 2018-02-26 21:21:28 +01:00
Laurent Destailleur
4866d63ece Fix method getListOfPayments in the wrong class 2018-02-26 09:45:15 +01:00
Laurent Destailleur
41638e6dff Fix back link of look and feel v7 2018-02-26 09:20:05 +01:00
Laurent Destailleur
7ff94c88bd Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-02-25 15:00:31 +01:00
Laurent Destailleur
251136bebf Fix PHPUnit 2018-02-25 15:00:14 +01:00
Laurent Destailleur
502f219f7f
Merge pull request #8231 from hregis/7.0_entity
FIX missing object entity in fetch
2018-02-25 12:59:38 +01:00
Regis Houssin
703d976b3b Fix: missing object entity in fetch 2018-02-24 16:21:16 +01:00
Regis Houssin
b216249214 Fix: missing hook parameters 2018-02-24 15:01:29 +01:00
Laurent Destailleur
bc0993d6cd Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-02-22 12:17:25 +01:00
Laurent Destailleur
7f419a29e7
Merge pull request #8072 from laudeco/hotfix/8028_replacement_bill
fix the bill replacement with discounts #8028
2018-02-20 15:19:19 +01:00
Laurent Destailleur
b361877ea8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/compta/facture/card.php
2018-02-20 12:48:28 +01:00
Laurent Destailleur
16fca2ee35 Fix bad link 2018-02-20 10:05:11 +01:00
John
49bad95d31 fix method exist test 2018-02-15 17:04:27 +01:00
John
63987fa32e fix invoice extrafield transmition to credit 2018-02-15 16:39:47 +01:00
Laurent Destailleur
7f8cbc0f62 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/adherents/type.php
	htdocs/contrat/services.php
	htdocs/contrat/tpl/linkedobjectblock.tpl.php
	htdocs/install/upgrade2.php
2018-02-14 22:08:18 +01:00
atm-ph
c690dfb258 Fix apply global progress don't update multicurrency values 2018-02-14 10:15:38 +01:00
Laurent Destailleur
30ba1c1702 FIX #8174 2018-02-12 14:02:51 +01:00