Commit Graph

52314 Commits

Author SHA1 Message Date
Laurent Destailleur
1ba2407da4 Merge remote-tracking branch 'origin/3.9' into develop 2016-02-25 01:42:03 +01:00
Laurent Destailleur
a0ccd8b0d4 Enhance purge script 2016-02-25 01:05:39 +01:00
Laurent Destailleur
017b607e53 Better script name 2016-02-25 01:05:03 +01:00
Laurent Destailleur
773e5e3b0a Fix: specific contact of object were lost when used to create invoice. 2016-02-25 01:03:37 +01:00
Laurent Destailleur
191394bf88 Fix: specific contact of object were lost when used to create invoice. 2016-02-25 01:02:11 +01:00
Laurent Destailleur
fe564489d6 Make report templates easier to use 2016-02-25 00:50:32 +01:00
Laurent Destailleur
4b89b0b7aa Fix bad status translation for shipment 2016-02-24 22:13:29 +01:00
Laurent Destailleur
6ee4637f35 Fix bad status translation for shipment 2016-02-24 22:12:38 +01:00
Laurent Destailleur
c3eb60325b Reduce nb of dirs 2016-02-24 18:18:24 +01:00
Laurent Destailleur
9f240c6c88 Better import examples 2016-02-24 17:27:28 +01:00
Laurent Destailleur
715b2024cd Better repair script 2016-02-24 17:17:41 +01:00
Laurent Destailleur
0f49bb8645 Clean code 2016-02-24 17:09:04 +01:00
Laurent Destailleur
a2b81cebfd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-02-24 17:05:45 +01:00
Laurent Destailleur
9e8fcd19aa Fix PHPCS 2016-02-24 17:05:34 +01:00
Laurent Destailleur
72059bb35b Merge pull request #4677 from mrsof/patch-6
Fix: Fatal error: Class 'FormVentilation' not found
2016-02-24 16:58:15 +01:00
Laurent Destailleur
02c0f52880 NEW Include sales representative into export of thirdparties 2016-02-24 16:56:24 +01:00
Laurent Destailleur
33d5fa38ef Fix pdfBuildThirdpartyName must return main name. Alias should be an
option.
2016-02-24 13:30:16 +01:00
Laurent Destailleur
513b46e1d4 NEW Can reopen an closed shipment 2016-02-24 13:19:25 +01:00
Laurent Destailleur
d5112c0c82 Better sample import scripts 2016-02-24 12:23:34 +01:00
Laurent Destailleur
0f6e88b460 Update css of warehouse list 2016-02-24 12:18:24 +01:00
Laurent Destailleur
371dec8503 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
	htdocs/langs/en_US/products.lang
	htdocs/langs/fr_FR/companies.lang
2016-02-24 12:13:12 +01:00
Laurent Destailleur
490ef11eb5 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-24 12:10:35 +01:00
Laurent Destailleur
5d1241be2f Sync transifex 2016-02-24 12:10:25 +01:00
Laurent Destailleur
2747259fbd Fix: missing payment term and condition into update method 2016-02-24 12:01:50 +01:00
Laurent Destailleur
449d44419d Fix: When module shipment is on, a contact of order is also contact of
shipment
2016-02-24 11:17:47 +01:00
Laurent Destailleur
09951888a5 Can select number of records for warehouse lists. 2016-02-23 23:04:17 +01:00
Laurent Destailleur
f55c1014ee Add more example of import scripts 2016-02-23 23:03:52 +01:00
Laurent Destailleur
769843f919 Correct multiprice import 2016-02-23 20:07:22 +01:00
Laurent Destailleur
57aebe4e1f Add script to import products 2016-02-23 20:00:07 +01:00
Laurent Destailleur
1a4413dbc3 Update how to 2016-02-23 19:51:52 +01:00
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
Sof
e6d06a67b4 FIX : Fatal error: Class 'FormVentilation' not found 2016-02-23 13:00:52 +01:00
Laurent Destailleur
4238c7a493 Merge pull request #4675 from simnandez/3.9
FIX :  Bad Argentina provences
2016-02-23 12:40:18 +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
Juanjo Menent
6db0f01fa4 FIX : Bad Argentina provences 2016-02-22 19:53:39 +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
cfdaa0e13c Fix missing translation
Fix import of state
2016-02-22 14:49:30 +01:00
Laurent Destailleur
d128df1fe5 Fix js error .submit is not a function 2016-02-22 14:33:14 +01:00
Laurent Destailleur
dcdc53464d Fix select2 text color 2016-02-22 14:25:12 +01:00
Laurent Destailleur
8e83f4f15c Fix missing translation load 2016-02-22 13:52:01 +01:00