Commit Graph

5142 Commits

Author SHA1 Message Date
Maxime Kohlhaas
85c03faec7 Merge branch 'mko186' into develop
Conflicts:
	htdocs/langs/en_US/orders.lang
	htdocs/langs/fr_FR/orders.lang
2012-10-05 08:30:09 +02:00
simnandez
caef97dc08 Task # 104: Check if module invoice is active and user has creation
permissions. Move creation invoice to action bar into customer card
2012-10-04 18:23:21 +02:00
Maxime Kohlhaas
0e17c7c063 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko186 2012-10-04 15:36:47 +02:00
Maxime Kohlhaas
87d643d482 Task # 104 : translations 2012-10-04 15:36:38 +02:00
Laurent Destailleur
59a33db53d Fix: Add warning to ask refresh. 2012-10-03 20:10:29 +02:00
Laurent Destailleur
61958f445d Fix translation 2012-10-03 14:15:07 +02:00
Laurent Destailleur
3bd20ee8ba Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-03 13:04:29 +02:00
Laurent Destailleur
6d8ea8dcd5 Update trans 2012-10-03 13:04:18 +02:00
Regis Houssin
4ed05b5b2e Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-03 12:41:02 +02:00
Regis Houssin
935bb09b99 Fix: better translation 2012-10-03 12:39:48 +02:00
Laurent Destailleur
2617fc21a6 Some fix: List of invoices to show in "to bill" menu must contains
"Validated, Shipment in process, Delivered" (some users may want to
make invoice before shipment, some after).
We keep workflow opened by default. Module workflow may restrict this
however.
Also, remove menu entry, because we now have direct link to page onto
list.
2012-10-03 11:43:39 +02:00
Maxime Kohlhaas
89e14043a1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko186 2012-10-02 11:01:21 +02:00
Spangaro Alexandre
3e4fd761a5 Add function to choose chart of accounts 2012-10-02 05:45:49 +02:00
Laurent Destailleur
082ee53dae Fix: Miscellaneous fix in supplier product input 2012-10-02 00:30:23 +02:00
Laurent Destailleur
eec2a7b34e Merge pull request #429 from atm-maxime/mko559
Task # 559 : add discount on supplier prices
2012-10-01 13:31:17 -07:00
Maxime Kohlhaas
1aa3156958 Task # 186 : new box of products with stock alert 2012-10-01 16:44:38 +02:00
Maxime Kohlhaas
1d21f24fa7 Task # 559 : Add possibility to define a discount for min quantity on supplier product prices 2012-10-01 11:25:17 +02:00
Regis Houssin
8c17266ed4 Merge pull request #425 from marcosgdf/translations
Added missing & improved es_ES translations
2012-10-01 01:11:30 -07:00
Marcos García
a4b0f7e521 Fixed es_ES typo 2012-10-01 04:17:17 +02:00
Marcos García
13cbf154e1 Added missing & improved es_ES translations 2012-10-01 03:09:37 +02:00
simnandez
6bbcb376b1 Trad: Add missing translations 2012-09-28 15:55:50 +02:00
Maxime Kohlhaas
398023e722 Task # 335 : translation 2012-09-28 14:29:20 +02:00
Maxime Kohlhaas
c0f22ac472 Task # 355 : autofill contat address with third party address 2012-09-28 14:27:16 +02:00
Regis Houssin
3b4090852c Merge pull request #420 from simnandez/develop
Trad: Add missing translation
2012-09-28 02:50:48 -07:00
Regis Houssin
0441c6dd46 Merge pull request #417 from aspangaro/develop
Continue working on accountancy
2012-09-28 02:43:54 -07:00
simnandez
67e38df6ee Trad: Add missing translation 2012-09-28 11:39:23 +02:00
Christophe Battarel
9f15a11b10 update lang files for import (csv options) 2012-09-28 10:28:17 +02:00
Laurent Destailleur
ad0e3ba4a0 Fix: Better translation 2012-09-27 10:48:40 +02:00
Laurent Destailleur
051b93c73b Qual: Code cleaner using field name instead of index number.
New: Can use new syntax to define parent of a menu
(fk_mainmenu=&fk_leftmenu=)
2012-09-27 00:05:13 +02:00
Spangaro Alexandre
e4391207e4 Add new dictionnary to edit accountingsystem 2012-09-26 20:37:28 +02:00
Christophe Battarel
2d911c097b update french translation for LocalTaxDesc 2012-09-25 08:06:47 +02:00
Laurent Destailleur
c5ed476f25 Merge pull request #412 from atm-maxime/develop
Task # 104 : Can create an invoice from several orders
2012-09-24 16:05:19 -07:00
Laurent Destailleur
f17906b331 Merge pull request #413 from aspangaro/develop
Add a new column in llx_c_tva
2012-09-24 16:03:05 -07:00
Laurent Destailleur
7d83fdce5b Fix: Several fixes into date functions
Qual: Add PHPUnit tests
2012-09-24 21:37:19 +02:00
Spangaro Alexandre
a6f9111b54 Add new column in llx_c_tva 2012-09-24 07:14:37 +02:00
Maxime Kohlhaas
bcbc35bd47 Task # 104 : added choice to auto close orders or not + translations 2012-09-23 18:00:30 +02:00
simnandez
a25f2eae46 Trad: Update ca_ES donations translation 2012-09-21 16:30:38 +02:00
Laurent Destailleur
5e9cd37107 Uniformise look of PHP Info page. 2012-09-21 00:13:20 +02:00
simnandez
cf72ffd650 Trad: Improve bank translations for adjust into pdf info size 2012-09-18 18:50:02 +02:00
simnandez
b65c23576a Trad: Add ca_ES and es_ES translations 2012-09-18 15:28:38 +02:00
Laurent Destailleur
4f0e4be449 Merge pull request #402 from cbattarel/develop
add option to select contact type associated to commercial agents for margin and commission modules
2012-09-18 01:24:00 -07:00
Christophe Battarel
951b98a963 add option to select contact type associated to commercial agents for margin and commission modules 2012-09-18 09:44:34 +02:00
Grand Philippe
d25e8fc584 missing translation 2012-09-17 11:18:20 +02:00
Laurent Destailleur
cd6a8fa761 New: Uniformize code 2012-09-17 02:07:14 +02:00
Laurent Destailleur
df3227ef7e Migrate spain to localtax type. 2012-09-16 16:56:24 +02:00
Laurent Destailleur
b724a78cb3 Fix: Debug dictionnary to add localtaxes 2012-09-16 15:04:55 +02:00
Laurent Destailleur
e7d3d9496c first step for extrafield for contact/address 2012-09-14 12:15:55 +02:00
Laurent Destailleur
643d6ff3f9 Fix: Debug feature predefined invoices 2012-09-14 10:09:56 +02:00
Laurent Destailleur
ed61508b3f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-13 10:14:47 +02:00
Laurent Destailleur
4cc56f0176 New: Extra fields supports more types (now int, string, double, date,
datetime)
2012-09-13 10:14:25 +02:00