Commit Graph

54672 Commits

Author SHA1 Message Date
Laurent Destailleur
c795803da1 FIX ref_supplier was not set. We also refered to old var names. 2016-05-05 20:19:56 +02:00
Laurent Destailleur
8a8e7cdf5e Merge pull request #4686 from bafbes/abb-10
New + Fix : handle supplier orders from customer orders with id variable name correction
2016-05-05 20:07:42 +02:00
Laurent Destailleur
461f62c200 Use the new global search form 2016-05-05 13:29:42 +02:00
Laurent Destailleur
5040fe46b0 FIX Missing number total of modules 2016-05-05 11:15:53 +02:00
Laurent Destailleur
f7bd2d16db Prepare upgrade of doliwamp 2016-05-04 20:48:49 +02:00
Laurent Destailleur
1af8ca458d Better image
Conflicts:
	build/exe/doliwamp/doliwamp.bmp
2016-05-04 20:34:25 +02:00
Laurent Destailleur
8b41970b2e Prepare upgrade of doliwamp 2016-05-04 20:19:53 +02:00
Frédéric FRANCE
5c81feab7e Add "no order" 2016-05-04 17:10:12 +02:00
Frédéric FRANCE
72695d1dee put colspan in td instead tr 2016-05-04 17:02:58 +02:00
Frédéric FRANCE
2f3a2303d4 put colspan in td instead tr 2016-05-04 16:49:15 +02:00
Laurent Destailleur
b4e5acbaa9 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/product/class/product.class.php
2016-05-04 14:43:40 +02:00
Laurent Destailleur
568a43214d Add code comment 2016-05-04 13:51:47 +02:00
Laurent Destailleur
cbbafb6432 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-05-04 13:50:17 +02:00
Laurent Destailleur
911e862a8e Fix missing translation and add a TODO to avoid infinite loop. 2016-05-04 13:49:05 +02:00
Laurent Destailleur
7998cefdd2 Fix mark a deprecated function as deprecated 2016-05-04 13:15:00 +02:00
Laurent Destailleur
878ba07fcd NEW The note on time spent can be entered when using the view per day. 2016-05-04 12:24:15 +02:00
Alexis Algoud
cefb5f6c6b NEW hook in expedition card 2016-05-03 14:20:42 +02:00
Florian HENRY
3d57e83094 Merge branch 'develop' into develop_advtargetemailiing
Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/install/mysql/tables/llx_c_accounting_category.sql
2016-05-02 20:40:42 +02:00
Florian HENRY
fda5e6002f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/websites/index.php
2016-05-02 20:27:34 +02:00
aspangaro
e0f600f226 FIX: Accountancy - Little fix et add page to assign massively the category 2016-05-02 20:21:37 +02:00
aspangaro
7749425468 Modify right to access on chart of accounts 2016-05-02 20:02:45 +02:00
Laurent Destailleur
d69904c14d Can set the home page of web sites 2016-05-02 15:51:18 +02:00
fmarcet
bc43c87f51 New: Add Perú regions 2016-05-02 11:36:29 +02:00
Laurent Destailleur
df4afdd663 NEW Can disable a module by renaming dir of module into module.disabled
(this save time for maintenance when working with FTP).
2016-05-02 09:49:58 +02:00
Alexis Algoud
c2f4f2fd9c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_details_per_warehouse_into_reassort 2016-05-02 09:38:42 +02:00
Laurent Destailleur
5823055cdf Work on website module. 2016-05-01 21:19:29 +02:00
Laurent Destailleur
46e2ed2810 NEW: All variant of ckeditor config can be tested into the setup page of
module.
2016-05-01 20:36:42 +02:00
Laurent Destailleur
170dc467ff Better code for website edition 2016-05-01 19:49:03 +02:00
aspangaro
1f015388b6 FIX: Fiscal year - Some mistakes on card 2016-05-01 17:04:55 +02:00
Laurent Destailleur
3045449dbb Work on website module. Can delete a page. 2016-05-01 17:01:38 +02:00
Laurent Destailleur
f59f3032c6 NEW: Rename path for generic medias files into '/medias' instead of
fckeditor. Add location of medias into title of media browser of
ckeditor.
Work on website module
2016-05-01 16:34:50 +02:00
Laurent Destailleur
87231908df Fix missing object constructor 2016-05-01 11:07:05 +02:00
aspangaro
88435a0d80 NEW: Accountancy - Prepare multiple journals 2016-05-01 08:03:40 +02:00
Laurent Destailleur
f324c662c2 Better update of database cleaning non expected records. 2016-04-30 21:58:00 +02:00
Laurent Destailleur
50323afe94 Add comment 2016-04-30 21:33:18 +02:00
Laurent Destailleur
6a123c91b5 Solve warnings that appears because code is using statically a mehtod
that can't be static yet.
2016-04-30 19:30:28 +02:00
Frédéric FRANCE
ffd80e3f8f select engine for code 128 didn't work 2016-04-30 18:56:16 +02:00
Laurent Destailleur
9c855f3a5e Start to work to have custom dir available and active by default. 2016-04-30 17:11:48 +02:00
Laurent Destailleur
a8363052c6 Better style 2016-04-30 15:55:39 +02:00
Laurent Destailleur
de59d115d9 Option THIRDPARTY_CUSTOMERPROSPECT_BY_DEFAULT and
THIRDPARTY_SUPPLIER_BY_DEFAULT to have fields customer/prospect/supplier
set when creating a new thirdparty.
2016-04-30 14:59:40 +02:00
frederic34
17463b4927 categories account like other categories 2016-04-30 14:45:24 +02:00
Laurent Destailleur
e61e717cac FIX Bad permission to edit bank account on customer invoice 2016-04-30 14:28:48 +02:00
Laurent Destailleur
f747018fb6 Clean dead code
FIX when editing price with tax, reset price without so i will be
recalculated.
2016-04-30 14:24:33 +02:00
Laurent Destailleur
97bf91cc5d Show both currency symbol and code 2016-04-30 14:09:00 +02:00
Laurent Destailleur
6ffb45f5d8 FIX Missing param user on update() 2016-04-30 13:58:35 +02:00
Laurent Destailleur
9e24abacac Missing translation load 2016-04-30 13:26:31 +02:00
aspangaro
e6843a64ae FIX: Accountancy - 3.8 - Chart of accounts are limited on only one country 2016-04-30 07:13:23 +02:00
aspangaro
3cf1d891ab FIX: Accountancy - 3.9 - Chart of accounts are limited on only one country 2016-04-30 07:05:10 +02:00
aspangaro
7041a041ce FIX: Accountancy - Chart of accounts are limited on only one country 2016-04-30 06:52:21 +02:00
Laurent Destailleur
e717baefe5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-30 01:43:44 +02:00