lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
56,393 Commits 43 Branches 150 Tags 886 MiB
6da82762f2
Commit Graph

56393 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
florian HENRY
4c4e404dae Add unit PRice 2016-10-24 08:53:39 +02:00
aspangaro
6314df035a Work on expense report accountancy integration 2016-10-24 07:16:26 +02:00
aspangaro
dc727ebb3c Accountancy - Add binding and journal for expense reports 2016-10-24 06:41:32 +02:00
aspangaro
0d62148a0f Accountancy - Add menu expense report accounts in configuration 2016-10-24 06:27:20 +02:00
aspangaro
845c770d01 War against colspan - Supplier payment card 2016-10-24 05:53:59 +02:00
aspangaro
d0544b0aea Merge remote-tracking branch 'Upstream/develop' into 5.0-p29 2016-10-24 05:27:49 +02:00
aspangaro
337e9db046 New: Expense report documents are now available in ECM module 2016-10-24 05:26:19 +02:00
Laurent Destailleur
39bc78909b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2016-10-24 03:35:43 +02:00
Laurent Destailleur
33a7b7037d Save information of vat code into database 2016-10-24 03:23:40 +02:00
Laurent Destailleur
c976044d70 Merge pull request #5910 from aspangaro/5.0-p28 
Better presentation for member edit card
 2016-10-24 03:20:24 +02:00
Laurent Destailleur
09ef693c5f Merge pull request #5908 from openthink-laurent/add-file-scheme-allowed-uris-schemes-links 
NEW Add file:// scheme to allowed URIs schemes for links
 2016-10-24 03:19:53 +02:00
Laurent Destailleur
e4da87d31c Merge pull request #5903 from atm-gauthier/FIX_thirdparty_margin 
FIX : margin tab on customer card must filter on current entity invoices
 2016-10-24 03:18:37 +02:00
Laurent Destailleur
4e23f1adf1 Merge pull request #5902 from aspangaro/5.0-p25 
Better presentation of invoice payment page
 2016-10-24 02:43:44 +02:00
Laurent Destailleur
9560ec54cc Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/compta/facture/list.php
 2016-10-24 02:15:12 +02:00
Laurent Destailleur
acf8874c6a Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2016-10-24 02:11:49 +02:00
Laurent Destailleur
a6c2758ca2 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2016-10-24 02:10:17 +02:00
Laurent Destailleur
18fad2088a git push origin developMerge branch 'atm-florian-dev_resource_extrafields' into develop 2016-10-24 02:05:56 +02:00
Laurent Destailleur
fdcc858008 Merge branch 'dev_resource_extrafields' of 
https://github.com/atm-florian/dolibarr into
atm-florian-dev_resource_extrafields

Conflicts:
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2016-10-24 02:05:34 +02:00
Laurent Destailleur
2f77549d2b Merge pull request #5897 from olsesacl/4-search-forun 
FIX: Search provider by price
 2016-10-24 02:04:01 +02:00
Laurent Destailleur
b1cab83af5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-24 02:02:40 +02:00
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