Laurent Destailleur
a89a4ee81a
Fix: Delete vat entry when bank line was already deleted.
2013-12-09 22:39:41 +01:00
Laurent Destailleur
c49af3da48
Fix: fields too large
2013-12-09 11:00:36 +01:00
Laurent Destailleur
579e7f8e63
Sync from transifex
2013-12-09 09:26:48 +01:00
Laurent Destailleur
d34d1aed2e
Fix: checkstyle
2013-12-09 02:21:21 +01:00
Laurent Destailleur
72250f656e
Merge remote-tracking branch 'origin/3.4' into 3.5
2013-12-09 02:17:43 +01:00
Laurent Destailleur
95a41ca2fd
Merge pull request #1343 from marcosgdf/missing-translations
...
Added missing translations for permissions of margins module
2013-12-08 17:01:38 -08:00
Laurent Destailleur
705192215a
Merge pull request #1341 from marcosgdf/bug-1182
...
Resolved bug #1182 : ODT company_country tag is htmlencoded
2013-12-08 16:49:50 -08:00
Laurent Destailleur
f36354234d
Merge pull request #1339 from daamien/patch-1
...
bug #1179
2013-12-08 16:48:52 -08:00
Laurent Destailleur
565fb615bc
Update gitignore
2013-12-09 01:41:48 +01:00
Laurent Destailleur
bf07bd5b24
Fix: Missing translation
2013-12-08 23:58:27 +01:00
Laurent Destailleur
f804833b9c
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/core/modules/modFacture.class.php
2013-12-08 22:38:10 +01:00
Laurent Destailleur
825640d645
Fix: Missing special code into export
2013-12-08 21:24:59 +01:00
Marcos García de La Fuente
02036af782
Added missing translations for permissions of margins module
2013-12-08 21:18:01 +02:00
Marcos García de La Fuente
beb93e9245
Resolved bug #1182 : ODT company_country tag is htmlencoded
2013-12-08 20:23:44 +02:00
Laurent Destailleur
a05d9b864a
Fix: Test must never be done on a translated string
2013-12-08 16:40:45 +01:00
Laurent Destailleur
b0e18348d9
Fix: Test must never be done on a translated string
2013-12-08 16:39:47 +01:00
Laurent Destailleur
3c0c9019b5
Comment
2013-12-08 15:40:22 +01:00
Laurent Destailleur
9b779e8ed8
Update ignore file
2013-12-08 15:09:35 +01:00
Laurent Destailleur
4d44f93c98
Remove <<<<
2013-12-08 12:01:59 +01:00
Laurent Destailleur
7aa2c9dcd1
Fix: Error management with corrupted module files
2013-12-08 02:33:32 +01:00
Laurent Destailleur
a90f6ef368
Fix: Error management with corrupted module files
2013-12-08 02:32:04 +01:00
Laurent Destailleur
37b0780523
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/ecm/tpl/builddatabase.tpl.php
htdocs/fourn/commande/liste.php
htdocs/product/admin/product_tools.php
2013-12-08 00:42:36 +01:00
Laurent Destailleur
d8cd7571ec
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-12-07 18:48:31 +01:00
Laurent Destailleur
b637b28c8b
Update ignore files
2013-12-07 18:47:58 +01:00
Laurent Destailleur
0e819ab5cd
Fix: Missing test
2013-12-07 16:43:35 +01:00
Laurent Destailleur
73e60e0629
Fix: Mass update of vat must work also for supplier prices
...
Conflicts:
htdocs/product/admin/product_tools.php
2013-12-07 12:06:41 +01:00
Laurent Destailleur
adf55408a4
Fix: Bad parameter that duplicate info.
2013-12-07 03:23:14 +01:00
Laurent Destailleur
fa0470bdb9
Fix: Mass update of vat must work also for supplier prices
2013-12-07 02:29:24 +01:00
Laurent Destailleur
01a9b23f26
Fix: Vat rate was not set during update
2013-12-07 01:22:27 +01:00
Laurent Destailleur
62e209520a
Fix: Update when submitting form
2013-12-07 00:53:58 +01:00
Laurent Destailleur
76d111b09f
Fix: W3C form must be outside table tag
2013-12-07 00:26:30 +01:00
Laurent Destailleur
87db1d880b
Fix: css
2013-12-06 21:03:59 +01:00
damien clochard
c36ba2a8ea
bug #1179
...
if there's a delivery date (date_livraison) then use it instead of the validation date (date_valid) to check if we need to display a warning or not...
For example, if we are in Septembre and there's an order that was validated in june but its delivery date is set to november then a warning is not necessary, since there's nothing to do but wait for the order to be delivered.
2013-12-06 13:08:30 +01:00
Laurent Destailleur
598a241366
Fix: minor css.
...
Fix: Alignement of screenshot was wrong. Wrapping too.
2013-12-06 10:23:26 +01:00
Laurent Destailleur
f60f5b2751
Fix: css
2013-12-06 10:04:53 +01:00
Laurent Destailleur
b99eddc73e
Fix: unit
2013-12-05 21:32:48 +01:00
Laurent Destailleur
b96c977fa1
Fix: W3C
2013-12-05 00:45:44 +01:00
Laurent Destailleur
42a3cbd27c
Fix: Missing css class
2013-12-04 23:21:57 +01:00
Laurent Destailleur
4d9712ea4c
Merge pull request #1318 from csalvador/develop-fichinterPDF
...
Develop fichinter pdf
2013-12-04 09:41:13 -08:00
Laurent Destailleur
d4c007a909
Merge pull request #1335 from FHenry/3.4
...
[ bug #1174 ] Product translated description not good into PDF Country
2013-12-04 09:39:18 -08:00
Laurent Destailleur
24ce511671
Fix: [ bug #1167 ] Supplier IBAN account number set but no account
...
specified warning
2013-12-04 18:20:58 +01:00
Laurent Destailleur
f2ba1a538b
Fix: Useless css styles make jmobile wrong
2013-12-03 20:54:27 +01:00
Laurent Destailleur
533199c151
Fix: Missing translation and missing comments
2013-12-03 20:54:22 +01:00
Laurent Destailleur
202c6b728e
Fix: Useless css styles make jmobile wrong
2013-12-03 20:53:39 +01:00
Laurent Destailleur
01c91c7194
Fix: Missing translation and missing comments
2013-12-03 20:44:31 +01:00
Laurent Destailleur
97e6acccde
Merge pull request #1336 from atm-alexis/develop
...
Error on mercure bill's number function.
2013-12-03 09:02:47 -08:00
Florian Henry
c2a8967b52
Much better fix for translated product description into PDF
2013-12-03 17:06:19 +01:00
Laurent Destailleur
6c7e173bba
Fix: jmobile broken with css tagtable, tagtr and tagtd
2013-12-02 22:31:02 +01:00
Laurent Destailleur
a3372a9a0a
Fix: Regression
2013-12-02 22:14:47 +01:00
Laurent Destailleur
d7bb138f43
Fix: Missing status 4 and 5
2013-12-02 22:12:57 +01:00