lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
55,202 Commits 43 Branches 150 Tags 886 MiB
2db38b4bcc
Commit Graph

55202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
2db38b4bcc Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/societe/list.php
 2016-10-16 19:02:36 +02:00
Laurent Destailleur
ab34885a89 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-10-16 18:34:31 +02:00
Laurent Destailleur
3d1ddbb923 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-10-16 18:34:20 +02:00
Laurent Destailleur
8edb51a017 FIX Extra fields of task not copied on project cloning 2016-10-16 18:27:39 +02:00
Laurent Destailleur
4c58793587 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-10-16 11:42:57 +02:00
Laurent Destailleur
2695f35284 Fix to avoid scroll on confirm popup 2016-10-16 11:40:10 +02:00
Juanjo Menent
f9a5074f2d Merge pull request #5879 from aspangaro/4.0-p3 
Fix: Some problems with loan module
 2016-10-16 10:37:39 +02:00
aspangaro
9ab0bfe905 Fix: Add another key for bank rather than to modify one 2016-10-16 06:50:13 +02:00
Juanjo Menent
87e8ac51be Merge pull request #5843 from simnandez/3.8 
FIX: Error when CATEGORIE_RECURSIV_ADD is enabled and new category is daughter of an already linked to object
 2016-10-15 17:18:35 +02:00
aspangaro
df581d8973 Fix: In payment card, only the capital is considered as a payment, interest and insurance are tax 2016-10-15 08:07:01 +02:00
aspangaro
25ba5074a7 Fix: Problem of presentation 2016-10-15 08:00:31 +02:00
aspangaro
1beaf003f0 Fix #5875: Links to loans are incorrect in the bank account transactions tab 2016-10-15 07:45:10 +02:00
aspangaro
380ab8bfa5 Fix: Show Ref/rowid of loan 2016-10-15 07:05:53 +02:00
aspangaro
49e2b1ffdb Fix: Error with language key 2016-10-15 06:56:38 +02:00
Laurent Destailleur
ac60dfa883 Merge pull request #5873 from olsesacl/facture_list_sql_mode 
FIX: Error show list invoice when sql_mode=only_full_group_by
 2016-10-15 02:22:20 +02:00
Laurent Destailleur
cec792f142 Merge pull request #5867 from aspangaro/4.0-p2 
Fix: Missing language key
 2016-10-15 02:16:14 +02:00
Laurent Destailleur
dda248cb57 Merge pull request #5870 from olsesacl/#5340 
FIX: #5340 Importing Tiers problem with capital field
 2016-10-15 02:16:00 +02:00
Laurent Destailleur
4fb66cf7a4 Better explanation for ftp module setup to avoid error with FTPS/SFTP. 2016-10-15 02:11:49 +02:00
Sergio Sanchis
63a7b506b1 Fix: Error if exist extrafield 2016-10-14 10:55:54 +02:00
Sergio Sanchis Climent
567f7e5365 FIX: #5340 2016-10-14 00:43:10 +02:00
aspangaro
0b08db16a1 Fix: Missing language key 2016-10-13 06:31:09 +02:00
Laurent Destailleur
24420edd46 Prepare 4.0.2 2016-10-11 14:36:13 +02:00
Laurent Destailleur
3eb8a667bc Fix clean of search criteria 2016-10-11 12:34:21 +02:00
Laurent Destailleur
b91b8c64b5 Fix sql error if we use separator extra field 2016-10-11 12:27:20 +02:00
Laurent Destailleur
789eab6098 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-10-11 12:21:16 +02:00
Laurent Destailleur
b2afe98060 Fix option unique of extrafields not saved 2016-10-11 12:20:14 +02:00
Juanjo Menent
ffd486e3d6 Fix #5843 best way fixing 2016-10-07 22:54:08 +02:00
Juanjo Menent
45dfb8ca62 Fix #5843 best way fixing 2016-10-07 22:32:11 +02:00
Juanjo Menent
298e5cee61 Fix #5843 best way fixing 2016-10-07 22:21:50 +02:00
Laurent Destailleur
6eca563131 Merge pull request #5846 from hregis/4.0_bug 
Fix: remove pdfmake for avoid errors
 2016-10-07 13:44:37 +02:00
Regis Houssin
bac21be15a Fix: remove for avoid errors 2016-10-07 13:32:34 +02:00
Regis Houssin
9e8d8c5f5c Fix: pdfmake is not present 2016-10-07 13:16:33 +02:00
Juanjo Menent
b7b18e3355 FIX: Error when CATEGORIE_RECURSIV_ADD is enabled and new category is daughter of an already linked to object 2016-10-07 10:12:25 +02:00
Laurent Destailleur
b787b1a3d2 Merge pull request #5828 from olsesacl/contracdet_add_edit 
FIX: Contract Error insert or edit empty value MYSQL 5.7
 2016-10-07 00:02:45 +02:00
Laurent Destailleur
a7fbb1e308 Merge pull request #5829 from olsesacl/#5779 
FIX: #5779 Field 'File' is required
 2016-10-06 23:59:02 +02:00
Laurent Destailleur
b19b624908 Merge pull request #5834 from simnandez/3.8 
FIX: only show projects of related third if external user
 2016-10-06 23:58:24 +02:00
Laurent Destailleur
02f4f6d039 Merge pull request #5839 from atm-florian/3.9 
FIX : missing column into SQL on thridparty list
 2016-10-06 23:56:18 +02:00
florian HENRY
ee20704a8a FIX : missing column into SQL on thridparty list 2016-10-05 17:20:56 +02:00
Laurent Destailleur
c1e10fa4e6 FIX Sql error in widget of product for stock alerts 2016-10-04 20:54:51 +02:00
Laurent Destailleur
6efbae0731 Fix title 2016-10-04 19:52:00 +02:00
Juanjo Menent
56245e2c9a FIX: only show projects of related third if external user 2016-10-04 16:51:44 +02:00
Sergio Sanchis Climent
ad52957439 FIX: #5779 2016-10-04 00:56:35 +02:00
Sergio Sanchis Climent
9024c225fd FIX: updateligne if $txlocaltax1 is null 2016-10-04 00:33:34 +02:00
Sergio Sanchis Climent
1dbb8d697e FIX: addline if $txlocaltax1 is empty 2016-10-04 00:26:39 +02:00
Laurent Destailleur
4f27ee4018 Add log 2016-10-03 12:40:04 +02:00
Laurent Destailleur
2cf9bf170e FIX Link on supplier invoice in widget was not clickable 2016-10-03 12:24:14 +02:00
Laurent Destailleur
6124c60157 FIX Nber of attached files were not reported in event report of email 
sent
 2016-10-03 00:44:01 +02:00
Laurent Destailleur
9fbe96dd38 Fix name of agenda tab 2016-10-02 21:31:32 +02:00
Laurent Destailleur
c0ea95df3e Enhance packager 2016-10-01 19:56:06 +02:00
Laurent Destailleur
49ea876b4a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-10-01 19:24:29 +02:00