Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
51,953 Commits 35 Branches 179 Tags 1.7 GiB
fb625f0ca7
Commit Graph

44795 Commits

Author SHA1 Message Date
Laurent Destailleur
fb625f0ca7 FIX #4812 2016-03-18 13:58:06 +01:00
Laurent Destailleur
c5e744bfc2 FIX #4839 2016-03-18 12:16:40 +01:00
Laurent Destailleur
5edeeae384 FIX Bad error and style message when changing its own login 2016-03-18 11:30:15 +01:00
Laurent Destailleur
7fa71214bc Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
	htdocs/core/modules/commande/doc/pdf_proforma.modules.php
 2016-03-18 11:06:41 +01:00
Laurent Destailleur
dc78cc7ced Merge pull request #4837 from hregis/3.9_order 
Fix: missing model selected
 2016-03-18 00:10:30 +01:00
Laurent Destailleur
e201357907 Merge pull request #4817 from aspangaro/3.9-p19 
Fix: 3.9 Problem of rowspan in edit mode on user card
 2016-03-18 00:02:19 +01:00
Laurent Destailleur
18804ee929 FIX Bad color of message password changed 2016-03-18 00:01:14 +01:00
Laurent Destailleur
75ed221fb8 Fix regression with last PR: change of password was not working. 2016-03-17 23:58:04 +01:00
Laurent Destailleur
404ac60226 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-03-17 23:45:29 +01:00
Laurent Destailleur
bbcc7d83ea Merge pull request #4834 from hregis/3.9_bug 
Fix: beware with merges in conflict !!
 2016-03-17 23:44:49 +01:00
Laurent Destailleur
e5f0027dbf Merge pull request #4823 from ndrosis/3.9 
FIX SQL syntax error in export
 2016-03-17 23:37:23 +01:00
Laurent Destailleur
22f6e0e92d Merge pull request #4831 from fmarcet/3.9 
FIX: Not showing sellprice properly on product list
 2016-03-17 23:33:05 +01:00
Laurent Destailleur
a102dc29d4 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-03-17 23:19:28 +01:00
Laurent Destailleur
fb16feb666 FIX Same term to create than other objects 2016-03-17 23:19:19 +01:00
Laurent Destailleur
76896e92a6 Merge pull request #4822 from atm-alexis/FIX_bad_function_name 
FIX # Bad function name setEventMessagess call on project delete
 2016-03-17 23:14:24 +01:00
Laurent Destailleur
c61110935d Merge pull request #4803 from aspangaro/3.9-p17 
FIX Missing language file loading
 2016-03-17 23:13:47 +01:00
Laurent Destailleur
2c4f01859c Merge pull request #4802 from grandoc/3.9 
[fix]: define  to avoid issue with external pdf models
 2016-03-17 23:13:13 +01:00
Alexis Algoud
19e3c1b089 FIX finished parameters not used 2016-03-17 16:35:23 +01:00
Regis Houssin
2642b710ea Fix: missing model selected 2016-03-17 15:56:03 +01:00
Regis Houssin
a2bb57e33b Fix: use clone instead dol_clone 2016-03-17 15:22:05 +01:00
Regis Houssin
ae16d6c45c Fix: missing color update 2016-03-17 15:11:57 +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
1683609d9a FIX Check of EAN13 barcode when mask was set to use 13 digits instead of 
12
 2016-03-17 12:00:38 +01:00
philippe grand
d434cee3fa [Qual] Typo 2016-03-17 09:40:05 +01:00
Regis Houssin
d2d38f58bf Fix: beware with merges in conflict !! 2016-03-17 09:22:12 +01:00
philippe grand
a196a76132 Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9 2016-03-17 09:21:32 +01:00
fmarcet
a1bc5dcc31 FIX: Not showing sellprice properly on product list 2016-03-16 16:35:07 +01:00
fmarcet
ad942afbf1 FIX: Not showing sellprice properly on product list 2016-03-16 16:30:59 +01:00
Laurent Destailleur
1ded08abef FIX When using option Price per level, when adding a predefined product, 
the vat for customer was not correctly set.
 2016-03-15 21:02:45 +01:00
Drosis Nikos
610249068d Fix syntax 
SQL error when ordering product list
 2016-03-15 12:48:46 +02:00
Alexis Algoud
19d7577267 FIX Bad function name call on delete 2016-03-15 11:14:51 +01:00
philippe grand
ac1b4a90de Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9 2016-03-15 10:24:01 +01:00
aspangaro
4167663491 Fix: 3.9 Problem of rowspan in edit mode 2016-03-15 06:53:17 +01:00
Laurent Destailleur
08c5fd2e36 FIX #4809 - Duplicate functions with different content 2016-03-14 14:38:30 +01:00
Laurent Destailleur
77c81397ea Version 3.9 final 2016-03-13 20:17:49 +01:00
aspangaro
5d88c10e94 Missing language file 2016-03-13 08:33:34 +01:00
Laurent Destailleur
f345ff7300 Fix regression on vat calculation when invoice was not a situation 
invoice
 2016-03-13 01:11:42 +01:00
philippe grand
adc552d5ff Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9 2016-03-12 20:52:09 +01:00
Laurent Destailleur
1b30c1adb4 Fix regression on vat calculation when invoice was not a situation 
invoice
 2016-03-12 20:49:38 +01:00
philippe grand
df1c5697be [fix]: define to avoid issue with external pdf models 2016-03-12 19:07:56 +01:00
Laurent Destailleur
e0809fc750 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	ChangeLog
	build/makepack-dolibarr.pl
	htdocs/compta/facture.php
	htdocs/product/document.php
 2016-03-12 18:40:50 +01:00
Laurent Destailleur
bad07bc38c Fix dos and bom and end of line 2016-03-12 18:30:19 +01:00
Laurent Destailleur
ba8e11d521 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-03-12 18:26:16 +01:00
Laurent Destailleur
58988e4ad2 Fix not visible menu title 2016-03-12 18:22:44 +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
Regis Houssin
7953f77b07 Fix: $fileparams is not defined 2016-03-11 18:08:27 +01:00
Florian HENRY
33c5658209 fix error return 2016-03-11 17:17:06 +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
7a5353efb2 Make things clearer about option MAIN_ENABLE_LOG_TO_HTML 2016-03-10 18:36:09 +01:00