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

51910 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
f345ff7300 Fix regression on vat calculation when invoice was not a situation 
invoice
 2016-03-13 01:11:42 +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
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
0727ee88e6 More robust initdemo script. 2016-03-12 18:33:32 +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
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 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
87c6a1f84c Merge pull request #4797 from FHenry/3.9 
accoutancy fix error return
 2016-03-12 11:45:09 +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
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
Laurent Destailleur
3b035819a9 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/modules/askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php
	htdocs/product/document.php
	htdocs/societe/commerciaux.php
 2016-03-10 15:03:53 +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
Laurent Destailleur
9463b26476 Merge pull request #4774 from marcosgdf/bug-multiprice 
Fixes a little problem with multiprice rules, now undefined ones evaluate to 0% variation
 2016-03-10 13:35:27 +01:00
Laurent Destailleur
45ab31815b Merge pull request #4767 from grandoc/3.9 
fix : missing translation
 2016-03-10 13:34:09 +01:00
Laurent Destailleur
a61882d847 Sync transifex 2016-03-10 12:44:05 +01:00
Florian HENRY
b58e155a6f FIX : #4785 2016-03-10 12:22:49 +01:00
philippe grand
6aa10a84df Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9 2016-03-10 09:01:11 +01:00
Laurent Destailleur
c907ca85c9 Fix css 2016-03-08 20:32:41 +01:00
Laurent Destailleur
043abdce03 Fix sql error 2016-03-08 20:30:09 +01:00
Laurent Destailleur
9f3f477877 FIX Navigation in result 2016-03-08 20:21:16 +01:00
Laurent Destailleur
881eca9fe5 Fix search on product ref 2016-03-08 19:46:42 +01:00
Laurent Destailleur
6d9bec9de1 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-03-08 17:32:00 +01:00
Laurent Destailleur
71246c864a FIX Bad td balance and default checkbox value 2016-03-08 17:31:46 +01:00
Marcos García de La Fuente
d43d0bfec1 Fixes a little problem with multiprice rules, now undefined ones evaluate to 0% variation 2016-03-08 12:16:32 +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
philippe grand
44d71c2bb4 fix : missing translation 2016-03-08 09:08: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
9865b0daa3 Merge pull request #4735 from aspangaro/3.9-p16 
Fix: 3.9rc2 Show accountancy account ventilated instead of the rowid of the account
 2016-03-06 14:46:24 +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
894953c275 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-03-06 12:40:11 +01:00
Laurent Destailleur
3dbe27030e FIX If all banks account are reconcilable to off, we must not show nb of 
transactions to reconciles.
FIX Switching status reconcile on-off was broken.
 2016-03-06 12:39:59 +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
Laurent Destailleur
15ecf98bcb Fix responsive on smartphone 2016-03-05 02:11:20 +01:00
Laurent Destailleur
7a1af17585 FIX Responsive of demo selection page was not working 2016-03-05 01:40:52 +01:00
aspangaro
ae472b932c Fix: 3.9rc2 Show accountancy account ventilated instead of the rowid of the account 2016-03-04 20:45:47 +01:00