Commit Graph

64295 Commits

Author SHA1 Message Date
Laurent Destailleur
7838ec6ed8 Merge pull request #7203 from atm-florian/dev_regen_invoice
NEW : generate invoice PDF on disount application or payment
2017-07-25 19:12:53 +02:00
Laurent Destailleur
420c521304 Merge pull request #7200 from hguibourgdev/patch-14
NEW : Add toolkit for StockLimit
2017-07-25 18:32:48 +02:00
Laurent Destailleur
5bf10737d9 Merge branch 'develop' into patch-14 2017-07-25 18:32:36 +02:00
Laurent Destailleur
4ef36746bd Merge pull request #7199 from hguibourgdev/patch-13
NEW : Add toolkit for StockLimit and DesiredStock
2017-07-25 18:31:12 +02:00
Regis Houssin
a52adcad4a Fix: change the condition 2017-07-25 13:52:10 +02:00
Laurent Destailleur
eaab34ee6c Fix permission 2017-07-25 13:36:57 +02:00
Laurent Destailleur
87e44141d6 Merge pull request #7198 from joseplluis/patch-3
Fix supplier invoice permission on board
2017-07-25 13:33:59 +02:00
Laurent Destailleur
6a3add6e57 Merge pull request #7196 from hregis/6.0_bug
Fix: translation error
2017-07-25 13:33:18 +02:00
florian HENRY
d6d454edc8 fix : Various misspelling class (eclipse Oxygen standard PHP control) 2017-07-25 13:32:27 +02:00
Laurent Destailleur
0d5cd5d970 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-07-25 13:31:54 +02:00
Laurent Destailleur
149e1f9c67 Merge pull request #7195 from atm-florian/6.0
fix : Various misspelling class (eclipse Oxygen standard PHP control)
2017-07-25 13:31:40 +02:00
Laurent Destailleur
a7c96416ba Merge pull request #7194 from hregis/6.0_bug2
Fix: getEntity $shared param value is now 1 by default
2017-07-25 13:29:42 +02:00
Laurent Destailleur
cfe445ab14 Code comment 2017-07-25 13:28:56 +02:00
Laurent Destailleur
2f4602e201 Merge pull request #7192 from hregis/develop_mc
Fix: remove unused $_COOKIE['DOLENTITY']
2017-07-25 13:25:49 +02:00
Laurent Destailleur
91d274b51e Merge pull request #7187 from hguibourgdev/patch-11
New : Prepare toolkit for alert warning
2017-07-25 13:19:00 +02:00
Laurent Destailleur
3ec2d6014b Merge pull request #7183 from hregis/4.0_bug2
Fix: wrong values if array used to force entity 0
2017-07-25 13:14:24 +02:00
Laurent Destailleur
d511fed504 Enhance modulebuilder 2017-07-25 12:44:55 +02:00
florian HENRY
cdcbff2a85 NEW : generate invoice PDF on disount application or payment 2017-07-25 12:20:51 +02:00
florian HENRY
d2ecebdddd new :new column into extrafeild table to get update create information 2017-07-25 11:57:36 +02:00
florian HENRY
0dba6f3383 NEW : Deposit invoice more explicit in invocie line description 2017-07-25 11:32:41 +02:00
Laurent Destailleur
dcf5fd20bb Fix navigation on card generated by modulebuilder 2017-07-25 10:38:39 +02:00
Laurent Destailleur
cba898e2b9 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
	htdocs/compta/facture.php
2017-07-25 10:12:28 +02:00
Laurent Destailleur
fdcc067c23 Fix regression. Restore lost link "Other invoices". 2017-07-25 10:02:56 +02:00
Laurent Destailleur
80da181802 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-25 09:55:29 +02:00
Laurent Destailleur
9043249740 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
	htdocs/commande/list.php
	htdocs/contrat/list.php
	htdocs/contrat/services.php
	htdocs/fourn/facture/list.php
2017-07-25 09:54:17 +02:00
Laurent Destailleur
aa9b4ce1f3 Fix too long combo for tags 2017-07-25 09:49:08 +02:00
Laurent Destailleur
bfd1fa3984 Enhance modulebuilder 2017-07-25 02:56:19 +02:00
Laurent Destailleur
13cd203502 Enhance modulebuilder 2017-07-25 01:54:54 +02:00
Laurent Destailleur
f6ab691c08 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-25 01:22:29 +02:00
Laurent Destailleur
e62a8d7bfa Debug modulebuilder 2017-07-25 01:22:06 +02:00
Laurent Destailleur
aff61fad7d Fix new generic classes system 2017-07-25 01:21:20 +02:00
Laurent Destailleur
fd84711a1c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-25 00:33:56 +02:00
Laurent Destailleur
70341d6169 Debug modulebuilder 2017-07-25 00:33:43 +02:00
Laurent Destailleur
307b8ef4f6 Debug modulebuilder 2017-07-25 00:32:06 +02:00
Laurent Destailleur
1d7674906f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-25 00:23:09 +02:00
Laurent Destailleur
e571616d52 Debug modulebuilder 2017-07-25 00:21:01 +02:00
Laurent Destailleur
bbb4047909 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-07-25 00:07:32 +02:00
Laurent Destailleur
b50236da4c Fix dir created at install 2017-07-25 00:07:17 +02:00
Laurent Destailleur
4ae60284fb Debug modulebuilder 2017-07-25 00:03:29 +02:00
Laurent Destailleur
9f3a5462b2 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-25 00:00:55 +02:00
Laurent Destailleur
41c6d9cbfb Debug modulebuilder 2017-07-25 00:00:08 +02:00
Laurent Destailleur
ddbf841514 Fix packager must ignore symbolic links in custom 2017-07-24 23:57:55 +02:00
hguibourgdev
6b9d25708b NEW : Add toolkit for StockLimit 2017-07-24 21:05:21 +02:00
Laurent Destailleur
1877a3b6fa Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-24 21:04:07 +02:00
Laurent Destailleur
8303cee676 Debug modulebuilder 2017-07-24 21:03:35 +02:00
hguibourgdev
e1f8cfd474 NEW : Add toolkit for StockLimit and DesiredStock 2017-07-24 20:59:46 +02:00
Josep Lluís
5f144ca940 Update index.php 2017-07-24 16:39:08 +02:00
Josep Lluís
50262491e6 Fix supplier invoice permission on board
Fix reading supplier invoice permission on main board
2017-07-24 16:24:53 +02:00
Regis Houssin
566bc555eb Fix: add possibility to force entity id 2017-07-24 15:41:22 +02:00
Laurent Destailleur
dcb79e66cc Debug modulebuilder 2017-07-24 13:55:12 +02:00