Commit Graph

52277 Commits

Author SHA1 Message Date
Laurent Destailleur
28b8258acb Fix in most cases, we don't need translated value of languages, jsut
list of language code.
Fix cost price was not updated.
2016-02-23 19:50:33 +01:00
Laurent Destailleur
7bd700113a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-02-23 13:03:04 +01:00
Laurent Destailleur
798a40f6c0 Update changelog 2016-02-23 13:02:53 +01:00
Laurent Destailleur
43276d3431 Merge pull request #4676 from IonAgorria/timezone-mktime
NEW: TimeZone can be supplied to mktime
2016-02-23 12:27:05 +01:00
Ion Agorria
673f0c70a6 NEW: TimeZone can be supplied to mktime 2016-02-22 22:00:59 +01:00
Laurent Destailleur
843dada35d Fix translation export/import 2016-02-22 17:42:41 +01:00
Laurent Destailleur
ff9a82c96f Merge pull request #4670 from atm-ph/new_add_multicurrency_supplier_invoice_payment
New add multicurrency supplier invoice payment
2016-02-22 16:26:31 +01:00
Laurent Destailleur
f759f26db9 Fix travis error 2016-02-22 16:20:21 +01:00
Laurent Destailleur
ef497e2129 Merge pull request #4669 from peckpeck/translation_import
Add support to product translation imports
2016-02-22 16:17:19 +01:00
Laurent Destailleur
a215f00776 Fix path after rename 2016-02-22 16:15:21 +01:00
Laurent Destailleur
e34185783e Merge pull request #4671 from GPCsolutions/develop-github
Added Github templates
2016-02-22 16:10:59 +01:00
Laurent Destailleur
77cbd885f2 NEW Add minimum stock and desired stock into import/export profiles.
NEW Add state into thirdparty export fields
2016-02-22 15:30:27 +01:00
Laurent Destailleur
81116da33b Add a control of file format 2016-02-22 15:10:33 +01:00
Laurent Destailleur
f6d1913bb7 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
2016-02-22 13:35:46 +01:00
Laurent Destailleur
a08fa814ec Better filter to exclude mysqldump warning 2016-02-22 13:32:01 +01:00
Laurent Destailleur
762ab060e4 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-22 13:28:18 +01:00
Laurent Destailleur
355f091246 FIX Option MAIN_FORCE_STATE_INTO_ADDRESS and SOCIETE_DISABLE_STATE 2016-02-22 13:28:08 +01:00
Laurent Destailleur
2a6009096d Add hidden option PRODUCT_DISABLE_LENGTH and PRODUCT_DISABLE_SURFACE 2016-02-22 13:11:46 +01:00
Laurent Destailleur
b591ba1280 Uncomment line 2016-02-22 12:56:41 +01:00
Laurent Destailleur
945eb9f094 NEW Add the event BILL_PAYED to list of supported events for module
notification.
2016-02-22 12:52:01 +01:00
Laurent Destailleur
2c31b9bcf5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-02-22 12:42:01 +01:00
Laurent Destailleur
fe06ad39c0 NEW Add a tool for developers to purge database with no loose of setup 2016-02-22 12:41:49 +01:00
Raphaël Doursenaud
d7304e516a Added Github templates 2016-02-22 12:32:24 +01:00
Laurent Destailleur
6181ab4149 FIX Avoid to return an error due to mysql warning 2016-02-22 09:32:42 +01:00
Laurent Destailleur
e7e6957073 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-22 09:27:53 +01:00
Laurent Destailleur
a4f189eea7 Fix do not show warning if account defined 2016-02-22 09:27:18 +01:00
phf
fd4cda819c New add supplier payment 2016-02-21 22:47:52 +01:00
Benoît Peccatte
c969b09ef7 Add support to product translation imports 2016-02-21 22:04:47 +01:00
Laurent Destailleur
54a4570b5f FIX #4580 2016-02-21 20:57:15 +01:00
Laurent Destailleur
110c5b537a Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-21 20:04:18 +01:00
Laurent Destailleur
c1d7f5a7ed FIX #4633 2016-02-21 20:00:40 +01:00
Laurent Destailleur
a118d58e5e Merge pull request #4638 from GPCsolutions/dolibarr-clone
[Qual] Replaced deprecated dol_clone calls
2016-02-21 19:22:47 +01:00
Laurent Destailleur
0dc76fa1cd Merge pull request #4626 from IonAgorria/hide-hourmins-2
Form changes to add duration info
2016-02-21 19:22:13 +01:00
Laurent Destailleur
64b373f0ff Merge pull request #4658 from abcnet-lu/lux-facture-mentions-obligatoires
FIX: Luxembourg correct professional ID "RCS" to display on invoices
2016-02-21 19:16:14 +01:00
Laurent Destailleur
77fcdc2e1d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-02-21 19:15:40 +01:00
Laurent Destailleur
3c2b50c6a2 Include PR 2016-02-21 19:14:18 +01:00
Laurent Destailleur
fb0e74645e Merge pull request #4663 from peckpeck/xlsx_support
NEW Allow imports from xlsx files
2016-02-21 19:12:38 +01:00
Laurent Destailleur
37a2d26916 Merge pull request #4660 from grandoc/3.9
enhance code help translation
2016-02-21 19:09:07 +01:00
Laurent Destailleur
00841ea3fd Merge pull request #4661 from IonAgorria/dynamic-prices-fixes
Dynamic prices fixes
2016-02-21 19:08:41 +01:00
Benoît Peccatte
5a8d1f1c95 Allow imports from xlsx files 2016-02-21 14:10:19 +01:00
phf
ec0282a28e New add multicurrency display on supplier payment 2016-02-21 13:26:48 +01:00
Ion Agorria
9fc7041a28 Use error_parser instead of reserved error var 2016-02-20 19:47:17 +01:00
Ion Agorria
c84e74c081 Fix dynamic price parsing in fournisseurs.php 2016-02-20 19:37:11 +01:00
philippe grand
6f6f2a0574 enhance code help translation 2016-02-20 11:18:02 +01:00
Laurent Destailleur
351ce6228d NEW Add width and height on product card 2016-02-20 04:49:02 +01:00
Laurent Destailleur
d3960b0809 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/lib/member.lib.php
	htdocs/expedition/card.php
2016-02-20 04:25:39 +01:00
Laurent Destailleur
7def330f54 Fix missing error message and input lost in shipment create page 2016-02-20 03:58:52 +01:00
Laurent Destailleur
2e27319d1b Fix Removed not expected br 2016-02-20 03:42:29 +01:00
Laurent Destailleur
a2817049c9 Fix must show warning only if threshold defined. 2016-02-20 03:34:56 +01:00
Laurent Destailleur
277d92af75 Secure migration for people using a RC 2016-02-20 03:14:29 +01:00