Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
72,072 Commits 36 Branches 189 Tags
afee39ea68ea5eaad940149d6bf0fad1294de229
Commit Graph

8469 Commits

Author SHA1 Message Date
Laurent Destailleur
9b8b3a1236 Merge pull request #8176 from hregis/7.0_bug2 
Fix: wrong param name (Travis error !)
 2018-02-12 03:25:23 +01:00
Laurent Destailleur
109c447171 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-12 03:21:37 +01:00
Laurent Destailleur
975608b9d3 FIX #8174 2018-02-12 03:21:04 +01:00
Laurent Destailleur
fa3b1c74a9 Fix bad link 2018-02-12 02:25:34 +01:00
Laurent Destailleur
1300f7172f NEW Can fix the bank account of a payment if payment not conciliated 2018-02-12 02:17:52 +01:00
Laurent Destailleur
1a6cff8fee Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-12 01:28:14 +01:00
Laurent Destailleur
b7b496132b Fix syntax error 2018-02-12 01:27:54 +01:00
Regis Houssin
2b7693c582 Fix: wrong param name (Travis error !) 2018-02-11 12:14:23 +01:00
Laurent Destailleur
26ee7ec5be Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/errors.lang
 2018-02-08 17:27:36 +01:00
Laurent Destailleur
d10d9f0fb2 Fix scrutinizer 2018-02-08 17:22:07 +01:00
Laurent Destailleur
19a0f552c9 Fix td balance 2018-02-08 16:50:01 +01:00
Laurent Destailleur
493a9a7289 Fix td balance 2018-02-08 16:49:28 +01:00
Laurent Destailleur
a200a7f149 Fix look and feel v7 2018-02-08 16:43:10 +01:00
Laurent Destailleur
cc20a9d1d5 FIX #8079 2018-02-08 16:43:05 +01:00
Laurent Destailleur
490e093926 Fix look and feel v7 2018-02-08 16:41:50 +01:00
Laurent Destailleur
91bed7c014 FIX #8079 2018-02-08 16:13:12 +01:00
Laurent Destailleur
eccdc9a075 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/langs/pt_PT/companies.lang
 2018-02-08 15:20:24 +01:00
Laurent Destailleur
2b2e68c78d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/societe/card.php
 2018-02-08 15:18:28 +01:00
Laurent Destailleur
39cd63e2d4 Merge pull request #8143 from simnandez/6.0 
FIX: Withdrawals lines not filter by company name and not respect dropdown limit lines by page
 2018-02-08 14:07:14 +01:00
Laurent Destailleur
ab21769aa2 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/facture/card.php
 2018-02-08 12:58:47 +01:00
Laurent Destailleur
c988d3f1cc Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/compta/facture.php
 2018-02-08 12:53:26 +01:00
Juanjo Menent
9b56555962 FIX: Withdrawals lines not filter by company name and not respect dropdown limit lines by page 2018-02-06 18:49:29 +01:00
Laurent Destailleur
ea92f6beae Fix for multicompany 2018-02-06 10:57:53 +01:00
Laurent Destailleur
074f4a3b46 Fix class not found when selecting project ref in lists 2018-02-06 00:34:14 +01:00
Laurent Destailleur
c2590b9c7e Fix: complete labels of operation if bank journal 
Conflicts:
	htdocs/compta/tva/class/tva.class.php
 2018-02-05 17:10:18 +01:00
Laurent Destailleur
ad384a9992 Fix default sort order 2018-02-05 17:08:47 +01:00
Laurent Destailleur
47cb9aef50 Fix: complete labels of operation if bank journal 2018-02-05 17:07:38 +01:00
Laurent Destailleur
a8ad9fb77d Fix default sort order 2018-02-05 16:28:25 +01:00
Laurent Destailleur
51847dfa8a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
	htdocs/core/menus/standard/eldy.lib.php
 2018-02-05 15:34:50 +01:00
Laurent Destailleur
85964e02de Fix css 2018-02-05 12:34:11 +01:00
Laurent Destailleur
f229f34d05 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-05 01:34:08 +01:00
Laurent Destailleur
30c683ed65 Fix properties into tooltip 2018-02-05 00:36:54 +01:00
Laurent Destailleur
8fe773204e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-04 23:18:33 +01:00
Laurent Destailleur
5455ab3280 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/projet/card.php
 2018-02-04 23:17:09 +01:00
Laurent Destailleur
0cc6654b06 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2018-02-04 13:25:00 +01:00
Regis Houssin
8ee1186492 Fix: wrong test 2018-02-04 09:05:35 +01:00
Regis Houssin
d5b7184c8d Fix: wrong test 2018-02-04 09:04:15 +01:00
Regis Houssin
a161ca37ff Fix: use product_type instead special_code 2018-02-04 08:58:31 +01:00
Regis Houssin
c1e6d88442 Fix: use product_type instead special_code 2018-02-04 08:55:51 +01:00
Laurent Destailleur
6de2a08d70 Fix scrutinizer bugs 2018-02-03 19:10:52 +01:00
Laurent Destailleur
2e705b5a88 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-02 10:41:20 +01:00
Laurent Destailleur
d3a6342034 Fix regeneration of PDF after creation of payment. 2018-02-02 10:37:10 +01:00
Regis Houssin
38d735341c Fix: remove lines with special code when convert to reduc 2018-02-02 10:24:16 +01:00
Regis Houssin
2147bd23e6 Fix: remove lines with special code when convert to reduc 2018-02-02 10:22:47 +01:00
Laurent Destailleur
f51d6a2e50 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-02 10:07:16 +01:00
Laurent Destailleur
74a34acf77 Tab vs space 2018-02-01 02:14:17 +01:00
Laurent Destailleur
9c6b6f244c Fix tooltip on invoice 2018-02-01 01:25:45 +01:00
Laurent Destailleur
7f9d6a5458 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/paybox/newpayment.php
	htdocs/public/payment/newpayment.php
	htdocs/public/paypal/newpayment.php
	htdocs/public/stripe/newpayment.php
 2018-01-31 20:25:24 +01:00
Laurent Destailleur
fec551631e Merge pull request #8066 from grandoc/new_push_16_01_2018 
NEW Add linked file tab to vat
 2018-01-29 21:28:14 +01:00
Laurent Destailleur
e208e5b8a7 Fix look and feel v7 2018-01-29 21:27:46 +01:00