lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
51,811 Commits 43 Branches 150 Tags 886 MiB
ea5b8a409c
Commit Graph

51811 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
cdaccf7c4b Fix: markRate can be 100 2016-01-10 18:28:50 +01:00
Laurent Destailleur
68ef5ef5a8 Merge pull request #4388 from aspangaro/3.9-p5 
Fix: HRM index - typo and presentation
 2016-01-10 18:21:32 +01:00
aspangaro
a88773cb81 Fix: Some problems presentation on accountancy module 2016-01-10 15:44:14 +01:00
aspangaro
47f63172e3 Fix: HRM index typo and presentation 2016-01-10 14:58:54 +01:00
Laurent Destailleur
70b57322a2 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-01-10 13:05:35 +01:00
Laurent Destailleur
6685502d5c Fix add Croatia into list of country in EEC 2016-01-10 13:05:22 +01:00
Regis Houssin
694530bfae Fix: Gives the possibility to the module, to provide his own family info 
and position of this family. (canceled $this->family)
 2016-01-10 13:00:48 +01:00
Laurent Destailleur
7e9ee6f047 Fix include error 2016-01-10 12:51:42 +01:00
Laurent Destailleur
99eec6b32c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-01-10 12:38:07 +01:00
Laurent Destailleur
6648ef0064 Fix missing include 2016-01-10 12:37:56 +01:00
Laurent Destailleur
cc4c5873e6 Fix sql error 2016-01-10 12:37:48 +01:00
Laurent Destailleur
e9e081bc37 Merge pull request #4292 from bafbes/patch-13 
Include local constants files and fetch their values to the correspon…
 2016-01-10 12:03:40 +01:00
Laurent Destailleur
59765f81c5 Prepare 4.0 dev 2016-01-10 11:59:21 +01:00
Laurent Destailleur
3f7d6a95f4 Prepare 4.0 dev 2016-01-10 11:57:40 +01:00
Laurent Destailleur
f3c83fba59 Merge pull request #4201 from GPCsolutions/dolibarr-composer 
Composer updates
 2016-01-10 11:56:47 +01:00
Laurent Destailleur
94814e58e5 Merge pull request #4334 from olsesacl/patch-1 
Fix check userlocaltax1_rate and userlocaltax2_rate
 2016-01-10 11:51:26 +01:00
Laurent Destailleur
40f0d0c9f2 Merge pull request #4321 from fmarcet/3.7 
FIX: Email templates not compatible with Multicompany
 2016-01-10 11:49:37 +01:00
Laurent Destailleur
6684bdce84 Merge pull request #4349 from benlo06/fr_4347 
CLOSE #4347 Add payment label to invoices csv exports
 2016-01-10 11:47:25 +01:00
Laurent Destailleur
70ffcfea33 Merge pull request #4380 from aspangaro/3.9-p4 
Fix: Donation some problems with french article
 2016-01-10 11:46:12 +01:00
Laurent Destailleur
d8001a8e7a Merge pull request #4379 from aspangaro/3.9-p3 
Fix: SQL error on user bank tab
 2016-01-10 11:45:40 +01:00
Laurent Destailleur
ffe80a36e1 Merge pull request #4378 from aspangaro/3.9-p1 
Fix: Add missing key language for propal
 2016-01-10 11:43:54 +01:00
Laurent Destailleur
c22bc8a29e Merge pull request #4377 from aspangaro/3.9-p2 
Fix: Wrong language file for 2 menu entries in accountancy module
 2016-01-10 11:38:21 +01:00
Laurent Destailleur
c07cb5a72e Merge pull request #4371 from frederic34/patch-7 
Always show remove button and why we can't remove
 2016-01-10 11:37:56 +01:00
Laurent Destailleur
2739fdcc2d Merge pull request #4367 from benlo06/fr_4366 
CLOSE #4366 Add hook for use custom ticket template
 2016-01-10 11:36:29 +01:00
Laurent Destailleur
aa0b002119 Fix #4354 2016-01-10 11:35:06 +01:00
Laurent Destailleur
fddd02eecc Complete fix #4354 2016-01-10 11:31:22 +01:00
aspangaro
965a96784c Fix: Donation some problems with french article 2016-01-10 07:35:00 +01:00
aspangaro
87f1e55bcb Fix: SQL error on user bank tab 2016-01-10 07:08:49 +01:00
aspangaro
af9e46d179 Fix: Wrong language file for 2 menu entries in accountancy module 2016-01-10 06:56:20 +01:00
aspangaro
e82f7761bc Merge remote-tracking branch 'Upstream/3.9' into 3.9-p1 2016-01-10 06:26:42 +01:00
Laurent Destailleur
8653e7fa5c Merge remote-tracking branch 'origin/3.9' into develop 2016-01-10 00:12:51 +01:00
Laurent Destailleur
2764fb240f Fix text color for category tags 
Fix banner for category translation tab
 2016-01-10 00:11:49 +01:00
Juanjo Menent
799546303b Merge pull request #4373 from simnandez/develop 
Fix: Move table interventions modify from 3.9 to 4.0
 2016-01-09 18:20:52 +01:00
Juanjo Menent
9c0b6ff5a4 Fix: Move table interventions modify from 3.9 to 4.0 2016-01-09 18:08:55 +01:00
Juanjo Menent
c47e18b7e2 Merge pull request #4197 from atm-ph/new_mail_input_file_multiple 
NEW hidden conf to use input file multiple from mail form
 2016-01-09 17:57:50 +01:00
Juanjo Menent
66c5d7c9ce Merge pull request #4150 from defrance/patch-84 
Add date start and end of intervention
 2016-01-09 17:56:39 +01:00
Juanjo Menent
c7ae943e57 Merge pull request #4311 from FHenry/develop 
NEW : if nb total of lines provided in print barre_liste, display beside title
 2016-01-09 17:52:05 +01:00
Juanjo Menent
8cabb87a2b Merge pull request #4299 from aspangaro/develop-a12 
Accountancy Add a list to select accounting account on dict
 2016-01-09 17:47:33 +01:00
Juanjo Menent
7f6f30e69e Merge pull request #4298 from aspangaro/develop-a11 
Accountancy Add a list to select accounting account on tax admin
 2016-01-09 17:47:03 +01:00
Juanjo Menent
cbf5021161 Merge pull request #4297 from aspangaro/develop-a10 
Accountancy Add a list to select accounting account on accoutancy admin
 2016-01-09 17:46:41 +01:00
Juanjo Menent
099ec2b0fb Merge pull request #4296 from aspangaro/develop-a9 
Accountancy Add a list to select accounting account on salaries admin
 2016-01-09 17:46:24 +01:00
Juanjo Menent
56af0761ee Merge pull request #4295 from aspangaro/develop-a8 
Accountancy Add a list to select accounting account on donation admin
 2016-01-09 17:46:02 +01:00
Juanjo Menent
095ee47724 Merge pull request #4268 from aspangaro/develop-a7 
Accountancy Review page to init accountancy on product/service
 2016-01-09 17:45:42 +01:00
Juanjo Menent
dbd427ea06 Merge pull request #4264 from aspangaro/develop-a6 
Accountancy Add a list to select accounting account on bank account
 2016-01-09 17:42:52 +01:00
Juanjo Menent
400a1f9825 Merge pull request #4253 from aspangaro/develop-a5 
Move fiscal year from accountancy module to configuration of Dolibarr
 2016-01-09 17:42:29 +01:00
Juanjo Menent
2bb2f22955 Merge pull request #4252 from aspangaro/develop-a4 
Accountancy Add a list to select accounting account on product card
 2016-01-09 17:41:43 +01:00
Frédéric FRANCE
55fb824a08 Update bills.lang 2016-01-09 10:43:34 +01:00
Frédéric FRANCE
0f5870fcf9 Update card.php 2016-01-09 10:42:03 +01:00
Frédéric FRANCE
0c6bd4e617 Update card.php 2016-01-09 10:37:53 +01:00
aspangaro
3ff9fe3123 Fix: Add missing key language for propal 2016-01-09 08:26:08 +01:00