Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
50,049 Commits 36 Branches 189 Tags
30f27b6fac6c19b11aa356648f9ffbd7ae2d22aa
Commit Graph

50049 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
30f27b6fac Merge pull request #4933 from frederic34/patch-10 
FIX correctly retreive ref_customer
 2016-04-04 00:36:49 +02:00
Laurent Destailleur
599b225489 FIX Creation of thumb image for size "small" was not done. 
Conflicts:
	htdocs/core/lib/files.lib.php
 2016-04-02 14:21:50 +02:00
Frédéric FRANCE
d4529d19c7 Update facture.php 
ref_client in order
ref_customer in shipping
 2016-04-01 17:32:58 +02:00
Laurent Destailleur
2a19326a3f FIX Missing database escaping on supplier price insert/update 2016-03-31 21:47:32 +02:00
Laurent Destailleur
00bf8caa8c FIX #4870 2016-03-25 17:55:58 +01:00
Juanjo Menent
4751c5ac67 Merge pull request #4881 from hregis/3.8_fix_merge 
Fix: 3.7-3.8 fix merge
 2016-03-23 22:59:18 +01:00
fmarcet
b8bc881e5a FIX: Email templates not compatible with Multicompany 
Conflicts:
	htdocs/admin/dict.php
 2016-03-23 13:57:17 +01:00
fmarcet
84e5c8b437 FIX: Email templates not compatible with Multicompany 
Conflicts:
	htdocs/admin/dict.php
 2016-03-23 13:56:06 +01:00
fmarcet
e2b4d39292 FIX: Email templates not compatible with Multicompany 
Conflicts:
	htdocs/admin/dict.php
 2016-03-23 13:54:39 +01:00
fmarcet
52d88db5c3 FIX: Email templates not compatible with Multicompany 
Conflicts:
	htdocs/admin/dict.php
 2016-03-23 13:53:18 +01:00
Regis Houssin
20d785ad28 Merge remote-tracking branch 'origin/3.7' into 3.8_fix_merge 
Conflicts:
	htdocs/filefunc.inc.php
 2016-03-23 13:40:05 +01:00
Laurent Destailleur
4f3f1eda7b FIX Duplicate records into export 2016-03-22 12:55:29 +01:00
Laurent Destailleur
876484dfb5 FIX Duplicate records into export 2016-03-22 12:54:26 +01:00
Laurent Destailleur
99ceb006e4 FIX Bad include and param for project numbering module call 2016-03-21 11:47:32 +01:00
Laurent Destailleur
660f825a34 Fix regression description line not visible 2016-03-19 19:25:28 +01:00
Laurent Destailleur
d09faadc24 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-03-19 19:14:03 +01:00
Laurent Destailleur
f0eb8ac794 Fix regression Product ref not visible 2016-03-19 19:13:27 +01:00
Laurent Destailleur
b023aa317f Merge pull request #4840 from atm-alexis/3.8_FIX_finished_param_not_use 
FIX finished parameters not used
 2016-03-18 00:11:07 +01:00
Alexis Algoud
19e3c1b089 FIX finished parameters not used 2016-03-17 16:35:23 +01:00
Laurent Destailleur
aa7eb4935c FIX VAT rate can be negative. Example spain selling to morroco. 2016-03-17 12:18:47 +01:00
Laurent Destailleur
08c5fd2e36 FIX #4809 - Duplicate functions with different content 2016-03-14 14:38:30 +01:00
Laurent Destailleur
0727ee88e6 More robust initdemo script. 2016-03-12 18:33:32 +01:00
Laurent Destailleur
eb65707da8 Fix code to publishing packages on foundation server 2016-03-12 12:50:05 +01:00
Laurent Destailleur
731d1cfe41 Update changelog for 3.8.4 3.8.4 2016-03-12 12:07:11 +01:00
Laurent Destailleur
e3df749666 Merge pull request #4796 from hregis/3.8_bug 
Fix: wrong fk_parent_line in credit note with invoiceAvoirWithLines
 2016-03-12 11:47:05 +01:00
Laurent Destailleur
fe955b8c51 Merge pull request #4799 from hregis/3.8_order 
Fix: $fileparams is not defined
 2016-03-12 11:45:00 +01:00
Laurent Destailleur
444fce0bd9 Prepare 3.7.4 3.7.4 2016-03-11 18:34:05 +01:00
Regis Houssin
7953f77b07 Fix: $fileparams is not defined 2016-03-11 18:08:27 +01:00
Regis Houssin
f87bb1206e Fix: wrong fk_parent_line in credit note with invoiceAvoirWithLines 
option
 2016-03-11 15:42:14 +01:00
Laurent Destailleur
a9058df753 Fix bad field in select 2016-03-11 10:47:17 +01:00
Laurent Destailleur
d6f3a5c046 Fix bad path 2016-03-10 15:01:39 +01:00
Laurent Destailleur
d663b28dac Fix no database structure change is allowed into minor versions 2016-03-10 13:49:13 +01:00
Laurent Destailleur
f742d4ec66 Fix code corrupting database 2016-03-10 13:46:52 +01:00
Laurent Destailleur
80805f78ea Disable too dangerous patch. Fix must be done by doing an insert only 
without creating/renaming databases.
 2016-03-10 13:43:09 +01:00
Laurent Destailleur
e346559219 Merge pull request #4770 from FHenry/3.8 
FIX : #4768
 2016-03-10 13:40:25 +01:00
Florian HENRY
b58e155a6f FIX : #4785 2016-03-10 12:22:49 +01:00
Florian HENRY
4bf2da4af7 revert SQL changes 2016-03-08 10:24:59 +01:00
Florian HENRY
a8e2b49c5b FIX : #4768 2016-03-08 10:22:31 +01:00
Florian HENRY
002a3888f4 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-03-07 10:57:46 +01:00
Juanjo Menent
7a65ebe2b4 Merge pull request #4733 from grandoc/3.8 
3.8
 2016-03-06 14:45:48 +01:00
Juanjo Menent
5fb6db9da3 Merge pull request #4732 from hregis/3.8_bug 
Fix: compatibility with multicompany transversal mode
 2016-03-06 14:45:21 +01:00
Laurent Destailleur
896f60a478 hidden solution to solve files overwriting each other 2016-03-06 00:47:00 +01:00
Laurent Destailleur
886aa1f8b6 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-03-06 00:39:25 +01:00
Laurent Destailleur
210d8435da FIX The part added with hidden option MAIN_DOC_USE_TIMING was included 
with a . instead of -. This make os think it is part of extension
instead of file name.
 2016-03-06 00:39:13 +01:00
Regis Houssin
5292920a84 Fix: don't see the sales representative of anothers entities 2016-03-04 17:10:42 +01:00
Regis Houssin
735a1c075e Fix: best sql request 2016-03-04 16:48:53 +01:00
philippe grand
8ba8182c64 Merge branch '3.8' of https://github.com/Dolibarr/dolibarr.git into 3.8 2016-03-04 16:32:33 +01:00
philippe grand
bd0320dea0 fix : missing traduction 2016-03-04 16:30:47 +01:00
Laurent Destailleur
a73b53ff9c Merge pull request #4728 from atm-ph/fix_send_mail_from_thirdparty 
Fix can't send mail to thirdparty contact if no mail defined on thirdparty card
 2016-03-04 16:18:15 +01:00
Laurent Destailleur
83ababeeac Merge pull request #4727 from hregis/3.8_fichinter 
Fix: wrong modelpdf var name
 2016-03-04 16:17:16 +01:00