Commit Graph

52215 Commits

Author SHA1 Message Date
Laurent Destailleur
f15e06f623 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-02-20 02:45:43 +01:00
Laurent Destailleur
fcc26f36ba Fix default first line to import is 1 2016-02-20 02:45:31 +01:00
Laurent Destailleur
0a02d58afb Merge pull request #4656 from defrance/patch-104
Add model_pdf fields for edition feature on product
2016-02-20 02:29:58 +01:00
Laurent Destailleur
e0f7e3dece Merge pull request #4659 from IonAgorria/fix-propal-fetch-date
Fix line fetch not converting dates
2016-02-20 02:26:30 +01:00
Laurent Destailleur
f762196c77 NEW Can define number of first and last line into import wizard. 2016-02-20 02:21:24 +01:00
Laurent Destailleur
266fb14a2c FIX Missing carriage return when phone is into property ->phone 2016-02-20 02:19:18 +01:00
Laurent Destailleur
7765e37101 Better support of option SOCIETE_SORT_ON_TYPEENT 2016-02-19 21:09:36 +01:00
Laurent Destailleur
4754ba5683 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/install/mysql/data/llx_10_c_regions.sql
	htdocs/install/mysql/data/llx_20_c_departements.sql
	htdocs/install/mysql/data/llx_c_forme_juridique.sql
	htdocs/langs/de_DE/companies.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/companies.lang
	htdocs/langs/fr_FR/compta.lang
2016-02-19 20:17:51 +01:00
Ion Agorria
6002897976 Fix line fetch not converting dates 2016-02-19 20:06:09 +01:00
Laurent Destailleur
82f57b2ccf Better position for modules 2016-02-19 20:05:25 +01:00
Laurent Destailleur
0faebc25ba Update translations 2016-02-19 19:33:31 +01:00
Laurent Destailleur
da284cda8c Add category Supplier Relationship Manager 2016-02-19 19:20:21 +01:00
Laurent Destailleur
00657d3bbe Fix sql forging error 2016-02-19 19:11:54 +01:00
Laurent Destailleur
dbb8460180 Fix avoid false warning 2016-02-19 19:11:31 +01:00
Laurent Destailleur
c07bb2dd5c Add translation file for website module 2016-02-19 18:51:31 +01:00
Laurent Destailleur
f8956f785d Fix syntax error 2016-02-19 16:12:39 +01:00
Laurent Destailleur
6ab8ba1cb1 Fix sql error 2016-02-19 16:10:14 +01:00
BENKE Charlie
d96c89afa1 Update 3.9.0-4.0.0.sql 2016-02-19 15:55:59 +01:00
BENKE Charlie
8f866254ac add model_pdf fields for edition feature 2016-02-19 15:47:37 +01:00
Laurent Destailleur
994715f8bb Upgrade romania 2016-02-19 15:47:00 +01:00
Laurent Destailleur
e820f09912 Start to introduce native responsive design 2016-02-19 15:28:43 +01:00
Laurent Destailleur
1cd0efd8db Fix picto 2016-02-19 14:18:50 +01:00
Laurent Destailleur
9c8d69eaa9 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
	htdocs/core/menus/standard/eldy.lib.php
2016-02-19 04:46:11 +01:00
Laurent Destailleur
cc524c8180 Fix bad picto 2016-02-19 04:41:29 +01:00
Laurent Destailleur
79bc7cf085 Fix showing description 2016-02-19 04:05:08 +01:00
Laurent Destailleur
3864bd35c9 Fix NPR Vat is working correctly with multiprice too 2016-02-19 03:59:43 +01:00
Laurent Destailleur
b70f2f329c Fix bad position of form 2016-02-19 03:59:22 +01:00
Laurent Destailleur
761ad0114c Merge pull request #4641 from atm-ph/new_add_multicurrency_supplier_proposal_order
New add multicurrency on supplier proposal/order
2016-02-19 03:36:23 +01:00
Laurent Destailleur
9e11fd988d Fix: color of category when showing full path must use color of last
element of path
2016-02-19 03:32:02 +01:00
Laurent Destailleur
03c3eb88d0 Merge pull request #4640 from atm-ph/fix_multicurrency_require
Fix replace dol_include_once() function by require_once for internal module
2016-02-19 02:50:05 +01:00
Laurent Destailleur
a708b7c2e4 Merge pull request #4648 from defrance/patch-101
change name or project area (standardisation)
2016-02-19 02:49:21 +01:00
Laurent Destailleur
16c44af690 Fix bad example of setup to use 2016-02-19 02:44:56 +01:00
Laurent Destailleur
4d0b9946f5 FIX Maxi serious problem when updating prices and vat of a product. All
mode (one price, price per level, ...) were impacted. Localtax setup
were lost.
2016-02-19 02:41:00 +01:00
Laurent Destailleur
3b5ce32cb0 Code comment 2016-02-19 01:47:00 +01:00
Laurent Destailleur
bd80249580 Fix code comment 2016-02-19 01:45:52 +01:00
Laurent Destailleur
52c82508e4 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/compta/charges/index.php
2016-02-18 23:27:57 +01:00
Laurent Destailleur
b0b2668428 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-18 23:21:22 +01:00
Laurent Destailleur
bc4c964b89 Several fixes in stock management (label, and bad action when lot module
is on)
2016-02-18 23:21:02 +01:00
Laurent Destailleur
0c11d9e794 Merge pull request #4651 from defrance/patch-102
Left a space between clone and $object
2016-02-18 17:23:17 +01:00
Laurent Destailleur
b269e997c1 Merge pull request #4650 from GPCsolutions/3.8-4649
Fix #4649 Wrong parameters order
2016-02-18 17:17:35 +01:00
BENKE Charlie
9fd22722ff left a space between clone and $object 2016-02-18 15:18:47 +01:00
Raphaël Doursenaud
dfe7c6f06f Fix #4649 Wrong parameters order 2016-02-18 12:21:11 +01:00
BENKE Charlie
d889a1d91f Change title page 'projects' to "project Area" 2016-02-18 11:56:32 +01:00
BENKE Charlie
7939169ae8 Change projets title Area 2016-02-18 11:54:48 +01:00
Laurent Destailleur
1a12eb33d6 Merge pull request #4639 from grandoc/3.9
[quality] : better help
2016-02-18 00:31:38 +01:00
Laurent Destailleur
5d2c189e0e Fix bad place of table 2016-02-17 23:45:25 +01:00
Laurent Destailleur
633de3bcb4 Fix list of object referers should not be set to invoice by default (may
be module is disabed). I replace with a message to choose list.
2016-02-17 22:33:02 +01:00
phf
e24a35b904 New add multicurrency on supplier proposal/order 2016-02-16 23:58:21 +01:00
Laurent Destailleur
5268038e00 Minor css enhancement 2016-02-16 22:58:24 +01:00
Laurent Destailleur
1c6bef5a4c NEW Use ellipsis truncation on too large left menu text 2016-02-16 22:45:14 +01:00