lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
59,359 Commits 43 Branches 150 Tags 886 MiB
864dc0d989
Commit Graph

51513 Commits

Author SHA1 Message Date
Laurent Destailleur
e340a53f7c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-05-20 11:58:50 +02:00
Laurent Destailleur
54f9990467 Merge pull request #6836 from atm-ph/fix_deposit_calculation 
Fix wrong calculation
 2017-05-20 11:57:05 +02:00
Laurent Destailleur
876257c312 Merge pull request #6869 from aspangaro/6.0-fec 
Update table accounting_bookeeping to prepare FEC format
 2017-05-20 11:41:35 +02:00
Laurent Destailleur
1fe17a6918 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-05-20 11:34:21 +02:00
Laurent Destailleur
9355f28d6c Merge branch 'develop' into api_files 2017-05-20 11:33:46 +02:00
Laurent Destailleur
601f3ea75e Fix dol_check_secure_access_document in write mode, add phpunit tests 2017-05-20 11:31:03 +02:00
Laurent Destailleur
df05980c3a Prepare table of notification per object (exemple agenda events) 2017-05-20 10:42:45 +02:00
Alexandre SPANGARO
1da0959a3a Merge remote-tracking branch 'uptream/develop' into 6.0-grh 2017-05-20 08:03:29 +02:00
Alexandre SPANGARO
4ff9607011 Update table accounting_bookeeping to prepare FEC format and harmonization 2017-05-20 07:56:33 +02:00
Laurent Destailleur
06b37d0e82 Work on dol_check_secure_access_document to support write question 2017-05-19 20:17:33 +02:00
Laurent Destailleur
ba5fb700ba Missing translation 2017-05-19 18:35:52 +02:00
Laurent Destailleur
e4ec5aa9a9 Merge pull request #6818 from atm-alexis/NEW_poc_list_product_with_listview 
NEW poc list product with listview
 2017-05-19 18:21:49 +02:00
Laurent Destailleur
807c77f754 Fix inconsistent options 2017-05-19 18:03:49 +02:00
Laurent Destailleur
bb2a9f9d0e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-05-19 17:24:31 +02:00
Laurent Destailleur
c30dcf78cb Show info when link has been deleted 2017-05-19 17:24:15 +02:00
Laurent Destailleur
d1c4439a0f Merge pull request #6858 from OPEN-DSI/module_agenda_linked_object_option 
NEW Module Agenda: Add option - Show linked object into agenda view
 2017-05-19 17:23:54 +02:00
Laurent Destailleur
330b9e7038 Merge pull request #6866 from absnc/project_element_shipping 
NEW Enable shipments in Project overview tab
 2017-05-19 17:10:51 +02:00
Laurent Destailleur
b35b40e2bf Align position of right 2017-05-19 17:08:42 +02:00
Laurent Destailleur
f65b29c135 FIX #6867 - Rewrite code to solve regression (not mixing array/string 
type and solve php warnings). Also restore $langs as a global var.
 2017-05-19 16:57:38 +02:00
Laurent Destailleur
2a0a0f12f3 Merge pull request #6867 from OPEN-DSI/core_dict_actioncomm_modify_color_position 
NEW Core dictionaries: Adds the ability to change the color and position …
 2017-05-19 16:33:05 +02:00
Laurent Destailleur
470165615f Fix look and feel v6 2017-05-19 16:32:23 +02:00
Laurent Destailleur
30cedd154e Fix default value must apply only if restore_lastsearch_values is on 2017-05-19 15:42:11 +02:00
Laurent Destailleur
4e7353f8a0 Clean code 2017-05-19 13:39:00 +02:00
Laurent Destailleur
aec4cef5de Clean some code for type of event deprecated since 3.3 2017-05-19 12:58:38 +02:00
KHELIFA
2382a0a4ee Core dictionaries: Adds the ability to change the color and position of the dictionary 'Types of agenda events' 2017-05-19 10:46:29 +02:00
absys
a2764bc4c2 Fix indent. 2017-05-19 18:14:42 +11:00
absnc
7b784a1dcb Enable shipments for project overview tab 2017-05-19 17:50:10 +11:00
Laurent Destailleur
ff2a268831 NEW Architecture to manage search criteria persistance (using 
save_lastsearch_values=1 on exit links and restore_lastsearch_values=1
in entry links)
 2017-05-19 00:52:13 +02:00
Laurent Destailleur
a28f8c84e4 Fix travis error 2017-05-18 22:23:59 +02:00
Laurent Destailleur
e43e37a14f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-05-18 22:12:12 +02:00
Laurent Destailleur
88fc7dbc3e Fix remove warning 2017-05-18 19:24:44 +02:00
Laurent Destailleur
353b7a4792 Merge pull request #6862 from camlafit/webservices-patches 
Webservices patches :
 2017-05-18 19:15:22 +02:00
Laurent Destailleur
ef575166c0 FIX #6651 2017-05-18 19:10:05 +02:00
Laurent Destailleur
932d3aab9d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-05-18 18:00:29 +02:00
Laurent Destailleur
0b0dbd9649 Code comment 2017-05-18 17:57:20 +02:00
Laurent Destailleur
2f72edca6c Merge pull request #6853 from grandoc/new_branch_16_05 
Update code using new css class
 2017-05-18 17:51:58 +02:00
Laurent Destailleur
f75e43dcda Merge pull request #6849 from grandoc/new_branch_15_05 
Update code using new css class
 2017-05-18 17:50:01 +02:00
Laurent Destailleur
92d7b907be Merge pull request #6844 from defrance/patch-10 
problems with additionnal template type
 2017-05-18 17:48:30 +02:00
Laurent Destailleur
7dbe3b1da9 Merge pull request #6843 from aspangaro/6.0-multijournal 
Fix : Sql error on salaries index for accountancy multijournal + debug
 2017-05-18 17:45:21 +02:00
Laurent Destailleur
5a79d11389 Avoid warning 2017-05-18 13:14:56 +02:00
Laurent Destailleur
dff7d00d2b Look and feel v6 2017-05-18 13:13:18 +02:00
Laurent Destailleur
eaa4b650f8 Code comment 2017-05-18 13:01:48 +02:00
Laurent Destailleur
4a46480ef5 Fix preview of PDF contract 2017-05-18 12:40:20 +02:00
Laurent Destailleur
a36a9fab2f Look and feel v6 2017-05-18 12:12:36 +02:00
Laurent Destailleur
0b52c43e05 Fix bad selection of progress when not known 2017-05-18 11:35:12 +02:00
Laurent Destailleur
1a1b27d68c Fix input of duration 2017-05-18 11:13:18 +02:00
cam.lafit
240371b59d UPDATE : add warehouse information on order creation 
* If stock management is enabled we must done information about warehouse source
If any warehouse is provided, client must send 0.
 2017-05-18 10:47:08 +02:00
cam.lafit
ec25869ec6 FIX : UpdateInvoice create object 
* To update data, function must work on invoice object
 2017-05-18 10:47:07 +02:00
Laurent Destailleur
fbb3406c5d Fix missing filters 2017-05-18 10:46:55 +02:00
cam.lafit
682f6f838e Change argument list CreateInvoiceFromOrder 
* invoice data are not mandatory
Only order information are required
 2017-05-18 10:36:37 +02:00