Commit Graph

39977 Commits

Author SHA1 Message Date
Laurent Destailleur
7d6779bd4a Merge remote-tracking branch 'origin/3.5' into develop 2013-12-27 18:09:31 +01:00
Laurent Destailleur
d07c767f25 Fix: Alignement of element into block login 2013-12-27 17:55:24 +01:00
Laurent Destailleur
538e6c5dc2 Fix: Alignement of element into block login 2013-12-27 17:51:36 +01:00
Laurent Destailleur
da2f35e1a2 Fix: Missing translation.
Fix: Title of tab not visible
2013-12-27 17:43:52 +01:00
BENKE Charles
94bf105b13 Update llx_projet_task.sql
new field "ref" present on update sql but not on the table
2013-12-27 17:14:56 +01:00
Laurent Destailleur
3bb4de3e86 Better translation 2013-12-27 15:56:00 +01:00
Laurent Destailleur
8f84d65a65 Merge pull request #1356 from defrance69/patch-22
Update llx_projet_task.sql
2013-12-26 16:20:23 -08:00
Laurent Destailleur
49f3242796 Merge pull request #1357 from marcosgdf/payment_menu
Payment menu
2013-12-26 16:19:49 -08:00
Laurent Destailleur
0e62d79ce2 Merge remote-tracking branch 'origin/3.5' into develop 2013-12-26 19:43:31 +01:00
Laurent Destailleur
94a217bdc1 Merge remote-tracking branch 'origin/3.4' into 3.5 2013-12-26 19:41:59 +01:00
Laurent Destailleur
a7d0a7d663 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-12-26 19:40:56 +01:00
Laurent Destailleur
fce34301f9 More test to avoid errors when env is not complete. 2013-12-26 19:39:29 +01:00
simnandez
3a496d1fa1 Fix: setup not saving changes 2013-12-26 11:33:47 +01:00
simnandez
91b104aeb8 Fix: setup not saving changes 2013-12-26 11:32:13 +01:00
Laurent Destailleur
22412443fe Fix: Overwrite bad value of limit payment date only if payment date is
defined.
2013-12-25 18:12:13 +01:00
Laurent Destailleur
76e4ba06a4 Fix: Calulcation of oustanding amount must not include abandonned
invoices.
2013-12-25 17:36:37 +01:00
BENKE Charles
e9ef9b6e8d Update llx_projet_task.sql
new field "ref" present on update sql but not on the table
2013-12-25 15:02:21 +01:00
Marcos García de La Fuente
098e6f4560 Added new tab types in modMyModule.class.php 2013-12-25 03:17:16 +01:00
Marcos García de La Fuente
917ddf0dee Payments and Supplier payment pages tabs can now be extended from modules. 2013-12-25 03:16:57 +01:00
Laurent Destailleur
fcfe94d4ec Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
	htdocs/product/liste.php
2013-12-24 16:28:27 +01:00
Laurent Destailleur
ec1aef0191 Fix: Can import contacts not linked to any thirdparties. 2013-12-24 16:11:23 +01:00
simnandez
fca35cb8b0 Fix: Bad url destination into category remove 2013-12-24 13:40:54 +01:00
simnandez
8c9d145759 Fix: Bad url destination into category remove 2013-12-24 13:39:58 +01:00
simnandez
bf333d4f54 Fix: Some config data are shared between suppliers orders and suppliers
invoices
2013-12-23 16:39:37 +01:00
simnandez
d6b2f96c19 Fix: Some config data are shared between suppliers orders and suppliers
invoices
2013-12-23 16:38:38 +01:00
Laurent Destailleur
81f1098d41 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-12-23 12:06:07 +01:00
Laurent Destailleur
331341bf5a Fix: Bad picto 2013-12-23 12:05:32 +01:00
Laurent Destailleur
39e2c3262a Merge pull request #1355 from FHenry/3.4
Fix [ bug #1202 ] Wrong amount in deposit % invoice from proposal
2013-12-23 02:21:23 -08:00
Laurent Destailleur
aad7d32f7d Merge pull request #1354 from csalvador/webservices-debug
Webservices debug
2013-12-23 02:20:15 -08:00
Florian Henry
e971e4dfff Fix [ bug #1202 ] Wrong amount in deposit % invoice from proposal 2013-12-23 11:05:14 +01:00
simnandez
d8644ec04c Fix: Unable to make a withdrawal with two or more invocies 2013-12-23 10:47:35 +01:00
simnandez
11353786a1 Fix: Unable to make a withdrawal with two or more invocies 2013-12-23 10:46:19 +01:00
Laurent Destailleur
d9c7dc8697 Fix: Add protection to not delete a root directory when deleting a
company.
2013-12-21 12:04:39 +01:00
Cédric Salvador
18b163c6db allow the webservice to create a private individual 2013-12-20 17:03:24 +01:00
Laurent Destailleur
47b1a2c082 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-12-20 13:55:10 +01:00
Laurent Destailleur
2bc579324d Fix: Opening agenda for a specific day
Fix: No picto of thirdparty of contact if link is broken
2013-12-20 13:51:59 +01:00
Laurent Destailleur
9e5e74cb58 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/fourn/commande/fiche.php
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/languages.lang
	htdocs/langs/es_ES/main.lang
2013-12-19 21:03:15 +01:00
Laurent Destailleur
acc4850d20 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-12-19 20:57:24 +01:00
Laurent Destailleur
b35f44e3cb New: Add option MAIN_HIDE_INACTIVETAB_ON_PRINT to hide inactive tabs
when you use the "print" view on screen.
2013-12-19 20:57:13 +01:00
simnandez
aac21c7a3c Trad: Improve es_ES trans 2013-12-19 18:33:54 +01:00
simnandez
4d3290e4bf Trad: Improve es_ES trans 2013-12-19 18:33:03 +01:00
simnandez
bfaf6d8ac8 Trad: Add missing es_ES trans
Conflicts:
	htdocs/langs/es_ES/companies.lang
2013-12-19 18:20:16 +01:00
simnandez
e4da8623f8 Trad: Add missing es_ES trans 2013-12-19 18:18:26 +01:00
Cédric Salvador
168412a2d6 Wrong parameters order in the function call 2013-12-19 16:06:59 +01:00
Cédric Salvador
0a0ef548ef Solved some bugs in order creation and validation 2013-12-19 16:06:59 +01:00
Cédric Salvador
f98838616e Do not forget the thumbs directory when returning the images paths 2013-12-19 16:06:59 +01:00
simnandez
03e2901070 Fix: Lost stats filters into year selection 2013-12-19 15:45:40 +01:00
simnandez
a1e0d84e37 Fix: Lost stats filters into year selection 2013-12-19 15:43:22 +01:00
simnandez
c35fc6b2d8 Trad: Fix missing translation 2013-12-19 12:48:19 +01:00
simnandez
8e247e8615 Trad: Fix missing translation 2013-12-19 12:47:39 +01:00