Commit Graph

56883 Commits

Author SHA1 Message Date
Laurent Destailleur
b284bdd953 NEW #5896 More complete data on event sent by email (name in title,
emails list in details)
2016-10-24 02:02:30 +02:00
Laurent Destailleur
7dd3beaa5f Merge pull request #5893 from olsesacl/task_reference
FIX: Documents no change directory if change reference of the task.
2016-10-24 01:12:26 +02:00
Laurent Destailleur
4e9f7c0fa8 Merge pull request #5892 from philippe-opendsi/develop
NEW : Add create events on project card
2016-10-24 01:11:52 +02:00
Laurent Destailleur
8ab31188ab Merge pull request #5891 from BeltranBot/patch-1
Fix: misspelling
2016-10-24 01:09:53 +02:00
Laurent Destailleur
c8c5ce3760 Merge pull request #5890 from mrsof/patch-4
Fix : Custom menu handler is not accessible for editing
2016-10-24 01:09:27 +02:00
Laurent Destailleur
b5b76dfaf7 Merge pull request #5889 from atm-gauthier/NEW_filter_socid_on_find_min_price_product_fournisseur
FIX param socid so find_min_price_product_fournisseur() use correct thirdparty when we create supplierorder from supplierproposal
2016-10-24 01:06:15 +02:00
Laurent Destailleur
8340316141 Merge pull request #5888 from olsesacl/trigger_expedition
Fix: Need declare $user for call trigger
2016-10-24 01:01:54 +02:00
Laurent Destailleur
adb05ec05b Merge pull request #5887 from simnandez/3.9
Fix: Bad localtaxes calc for Spain if VAT is 0. For >= 3.9.x
2016-10-24 01:01:42 +02:00
Laurent Destailleur
fe71c0cb2d Merge pull request #5886 from simnandez/3.8
Fix: Bad localtaxes calc for Spain if VAT is 0
2016-10-24 01:01:04 +02:00
Laurent Destailleur
024c0501bf Merge pull request #5885 from GPCsolutions/develop-members-types
Add deprecated property explicitly
2016-10-24 00:59:39 +02:00
Laurent Destailleur
6b67e69412 git push origin developMerge branch 'atm-gauthier-NEW_parent_warehouse' into develop 2016-10-24 00:58:12 +02:00
Laurent Destailleur
3c3c5d06a1 Merge branch 'NEW_parent_warehouse' of
https://github.com/atm-gauthier/dolibarr into
atm-gauthier-NEW_parent_warehouse

Conflicts:
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-10-24 00:58:02 +02:00
Laurent Destailleur
8e8506968f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-24 00:45:09 +02:00
Laurent Destailleur
ca62afb489 git push origin developMerge branch 'atm-gauthier-NEW_customerorders_to_bill' into develop 2016-10-24 00:44:47 +02:00
Laurent Destailleur
0b63f89e3a Merge branch 'NEW_customerorders_to_bill' of
https://github.com/atm-gauthier/dolibarr into
atm-gauthier-NEW_customerorders_to_bill

Conflicts:
	htdocs/langs/en_US/bills.lang
2016-10-24 00:44:37 +02:00
Laurent Destailleur
e388feee07 Merge pull request #5771 from defrance/patch-28
Add update_total function (like on other element)
2016-10-24 00:41:27 +02:00
Laurent Destailleur
468ff6795a Merge pull request #5827 from aspangaro/5.0-p20
Work on supplier type (Replacement / deposit / credit note) invoice
2016-10-24 00:38:32 +02:00
Laurent Destailleur
ab3cdfa16d Clean code 2016-10-24 00:33:39 +02:00
Laurent Destailleur
60ba6164e4 Merge pull request #5883 from aspangaro/5.0-p22
Accountancy - Add loan module in step to configure the accountancy
2016-10-24 00:17:09 +02:00
Laurent Destailleur
6806bec859 Merge pull request #5882 from EuskalMoneta/bug-5849
FIX #5849 Loosing field company on member change
2016-10-24 00:12:25 +02:00
Laurent Destailleur
f0a183a8c7 Merge pull request #5905 from grandoc/4.0
Fix : Fatal error: Call to a member function fetch() on null for intervention
2016-10-24 00:11:51 +02:00
Laurent Destailleur
399d691340 Merge pull request #5909 from aspangaro/5.0-p27
Better presentation for user edit card
2016-10-24 00:10:31 +02:00
Laurent Destailleur
0b63cd867e Merge pull request #5913 from oldenboom/4.0
Fix donation list
2016-10-24 00:09:34 +02:00
Laurent Destailleur
edd8b8ce92 FIX Sort list of file on ecm module 2016-10-23 23:44:03 +02:00
Laurent Destailleur
939afa9569 NEW Can make reconcile directly from bank entry list 2016-10-23 23:24:55 +02:00
Laurent Destailleur
534202ad45 NEW Can make reconcile directly from bank entry list 2016-10-23 23:13:03 +02:00
Rembert Oldenboom
3304593c4d Merge branch 'fix_don_list' into 4.0 2016-10-23 17:12:30 +02:00
Rembert Oldenboom
246d09f979 Fix paging donations list 2016-10-23 17:11:55 +02:00
Rembert Oldenboom
25a29c8982 Revert "Cleanup"
This reverts commit 070980f5a6.
2016-10-23 17:04:43 +02:00
Rembert Oldenboom
65b986d9ec Revert "Cleanup"
This reverts commit 070980f5a6.
2016-10-23 17:04:21 +02:00
Rembert Oldenboom
070980f5a6 Cleanup 2016-10-23 16:59:57 +02:00
Rembert Oldenboom
9c6933a796 Fix pager 2016-10-23 16:53:45 +02:00
Laurent Destailleur
b8c9e95281 Fix translation 2016-10-22 19:14:31 +02:00
Laurent Destailleur
9ab8f76777 Fix insert supplier invoice line 2016-10-22 18:40:21 +02:00
Laurent Destailleur
8fa44e9363 Fix balance calculation 2016-10-22 17:56:12 +02:00
Laurent Destailleur
35601775e0 By default we open a new tab on external url link 2016-10-22 17:05:47 +02:00
Laurent Destailleur
abc471575a Fix sql error 2016-10-22 17:00:19 +02:00
Laurent Destailleur
7ceb3cb62a FIX Avoid error 500 if phpexcel is disabled 2016-10-22 16:53:22 +02:00
Laurent Destailleur
ffcfe30529 FIX Avoid errors on debian 2016-10-22 16:51:54 +02:00
Laurent Destailleur
1c59721294 FIX Solve backup when using mysqldump that return warning 2016-10-22 16:20:51 +02:00
Laurent Destailleur
629af89986 FIX Solve backup when using mysqldump that return warning 2016-10-22 16:18:28 +02:00
Laurent Destailleur
11609eab71 Update doc 2016-10-22 15:03:13 +02:00
Laurent Destailleur
dd9095531a Fix for debian package 2016-10-22 15:03:00 +02:00
Laurent Destailleur
6965e987f0 Keep fpdi embedded 2016-10-22 14:35:45 +02:00
Laurent Destailleur
d002648733 Alignement 2016-10-22 14:25:56 +02:00
Laurent Destailleur
14c26bafbf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-22 14:23:42 +02:00
Laurent Destailleur
a057cb93c9 Debug accounting module 2016-10-22 14:23:33 +02:00
Laurent Destailleur
4eeae6e054 Debug accounting module 2016-10-22 14:05:04 +02:00
Laurent Destailleur
14c9cd4490 Fix help with new menu 2016-10-22 13:57:47 +02:00
Laurent Destailleur
14e78ef50b Mutualize code of 2 lists into one page. 2016-10-22 13:52:43 +02:00