Commit Graph

55229 Commits

Author SHA1 Message Date
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
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
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
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
0b63cd867e Merge pull request #5913 from oldenboom/4.0
Fix donation list
2016-10-24 00:09:34 +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
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
philippe grand
14227549a8 Fix : Fatal error: Call to a member function fetch() on null 2016-10-21 16:03:56 +02:00
philippe grand
12af0de9f1 Merge remote-tracking branch 'upstream/4.0' into 4.0 2016-10-21 15:57:35 +02:00
Laurent Destailleur
c44aa8f4d7 Fix warnings 2016-10-21 13:23:39 +02:00
Laurent Destailleur
3ca3b7ab78 Fix code comment 2016-10-21 10:36:11 +02:00
Sergio Sanchis Climent
78f1b428b0 FIX: Search provider by price 2016-10-19 21:42:53 +02:00
Sergio Sanchis Climent
4800918323 FIX: Documents no change directory if change reference of the task. 2016-10-18 23:17:45 +02:00
Laurent Destailleur
24ee2bce14 FIX Can edit the customer ref even if order is not draft. 2016-10-18 12:57:30 +02:00
Sergio Sanchis
81a31e8390 Fix: Need declare $user for call trigger 2016-10-18 10:52:07 +02:00
Laurent Destailleur
46c985d8cc FIX Hidden option PRODUCT_MAX_VISIBLE_PHOTO 2016-10-17 15:16:21 +02:00
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
Xebax
ae249a964b FIX #5849 Verification du champ Societe sur une modification adherent 2016-10-16 13:19:36 +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