Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
40,390 Commits 36 Branches 189 Tags
f34aadef3df57794de74006bc2c2c9fc4da6be12
Commit Graph

239 Commits

Author SHA1 Message Date
Laurent Destailleur
81ff0a8643 Fix: Missing initialized value 2014-04-12 01:45:18 +02:00
Laurent Destailleur
06b2c646c3 Fix: Add a space after (int) for travis succes ;) 2014-03-06 18:31:02 +01:00
Alexis Algoud
d139009ef5 bug on update service with service created in 3.4 2014-03-05 15:29:28 +01:00
Laurent Destailleur
ccab2b7af4 Fix: Must use "null" for value when finished is not defined but not when 
finished is "0".
 2014-02-12 19:00:06 +01:00
Laurent Destailleur
319b13dafb Fix: Field nature is not correctly filled. 2014-02-08 01:02:09 +01:00
Laurent Destailleur
9519c89110 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-01-21 13:23:27 +01:00
Laurent Destailleur
d7e111b3bd Fix: Missing parent tables 2014-01-21 13:18:30 +01:00
Cédric Salvador
68e42bc24e fixed wrong thumbnails directory 2014-01-07 17:26:12 +01:00
Cédric Salvador
f98838616e Do not forget the thumbs directory when returning the images paths 2013-12-19 16:06:59 +01:00
Laurent Destailleur
f0eb98c27a Fix: Serious pb with loading stocks. If we use product->stock_reel or 
product->stock_warehoure[], we must call product->load_stock() after the
product->fetch().
 2013-12-10 19:42:49 +01:00
Laurent Destailleur
a6b188ed93 Fix: We should not load stock details at each product fetch 2013-12-10 19:41:45 +01:00
Laurent Destailleur
aa4ae60826 Fix: sql where on an int must not contains ' 2013-12-10 18:54:44 +01:00
Laurent Destailleur
b911d30684 Fix: Stock into subproduct was wrong 
New: Show best sell price and total for virtual products
 2013-11-14 17:16:17 +01:00
Laurent Destailleur
94afc84a0c Fix: price should not be lower than min price. 2013-11-06 19:31:13 +01:00
Laurent Destailleur
ca95bd67f8 Qual: control of delete usage 2013-10-27 02:23:25 +02:00
Francis Appels
dde9a6da39 fix: delete() 
The delete method does not delete product_stock record.
Typing error in delete product record debug log, sql iso sqlz
 2013-10-15 11:11:42 +02:00
Laurent Destailleur
957ff08458 New: Add update method for web service product. 2013-10-01 11:59:35 +02:00
Laurent Destailleur
4cf84c4ea8 New: Add hidden option MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS 2013-09-28 13:24:58 +02:00
Laurent Destailleur
1f6d0ab3ef Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/product/class/product.class.php
 2013-08-27 09:36:54 +02:00
Florian Henry
2dce07590c Fix: If only service module is activated, it's impossible to delete 
service
 2013-08-26 14:39:35 +02:00
Cédric Salvador
e36613f0f0 added the desired stock field to the create/edit product UI 2013-07-29 12:31:04 +02:00
Laurent Destailleur
1d4ce231db Add manually patch 
9ae9b2b02a
 2013-07-27 12:22:00 +02:00
Laurent Destailleur
cba1d73dd4 Fix: Can autoselect warehouse if only one warehouse 2013-06-24 19:34:56 +02:00
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
Regis Houssin
cb9dcfa369 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-24 17:13:39 +02:00
Regis Houssin
aa7e61178a New: add product price sharing for multicompany 2013-06-24 17:13:08 +02:00
Regis Houssin
9992bebb13 New: add product price sharing for multicompany 2013-06-24 17:12:41 +02:00
Laurent Destailleur
570275cd76 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/opensurvey.lang
	htdocs/opensurvey/public/index.php
 2013-06-21 15:37:17 +02:00
Florian Henry
035edc12ce Fix [ bug #945 ] error adding a service 2013-06-19 14:41:18 +02:00
Laurent Destailleur
c748f3d834 Qual: Removed useless methods 
Qual: Removed deprecated vars
Qual: Free memory
 2013-06-16 21:31:21 +02:00
Marcos García
829b3bfc1d CR fix 
GIt required mi to commit this changes
 2013-06-14 12:48:27 +02:00
Laurent Destailleur
499440be16 Merge remote-tracking branch 'origin/3.4' into develop 2013-06-14 01:29:43 +02:00
Laurent Destailleur
980901b557 Qual: id of an instance should not be provided into method of instance 2013-06-14 00:23:38 +02:00
Laurent Destailleur
5f60a7c88c Fix: Multiprices were not update by mass vat update tool 2013-06-14 00:11:57 +02:00
Laurent Destailleur
bd8f1f2d2f Fix: Multiprices were not update by mass vat update tool 2013-06-14 00:11:15 +02:00
Laurent Destailleur
d3a500d6c4 Fix: Missing price level for triggers 2013-06-13 23:26:06 +02:00
Laurent Destailleur
12c3fe2558 Fix: Missing price level for triggers 2013-06-13 23:24:58 +02:00
Laurent Destailleur
d9f5151c39 Fix: Bad default value for finished property 2013-06-13 15:53:17 +02:00
Marcos García
e727100cf0 New: Clone product/service composition 2013-06-10 00:11:25 +02:00
Regis Houssin
c9a71439b2 Fix: EOF 2013-06-05 16:24:32 +02:00
Laurent Destailleur
eac4aa7e28 New: Module mailman can subscribe/unsubscribe to ML according to 
categories of member.
 2013-06-05 15:44:42 +02:00
Laurent Destailleur
eadfa66f2c Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/class/infobox.class.php
 2013-06-04 22:59:28 +02:00
Laurent Destailleur
6cf1d25529 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	ChangeLog
 2013-06-03 11:09:40 +02:00
Marcos García
cf1d269f15 Avoid warnings 2013-06-01 16:11:45 +02:00
Laurent Destailleur
fc158d1e10 Merge pull request #934 from KreizIT/develop 
Fix invalid permission test when deleting services
 2013-05-08 00:11:01 -07:00
Cedric GROSS
d1c1cf6bc0 Fix invalid permission test when deleting services 2013-05-07 12:07:06 +02:00
Laurent Destailleur
fc0d5abd14 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	ChangeLog
	htdocs/compta/prelevement/bons.php
	htdocs/compta/prelevement/fiche-stat.php
	htdocs/contact/class/contact.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modSociete.class.php
	htdocs/projet/fiche.php
	test/phpunit/FilesLibTest.php
 2013-05-03 00:15:02 +02:00
Grand Philippe
114ace6499 fix: undefined property 2013-04-30 15:22:39 +02:00
fhenry
5dce16863f Review delete extrafield in delete class method 2013-04-26 17:20:21 +02:00
Laurent Destailleur
6adaf2fa8f Fix: Pb when using virtual products inside virtual products 2013-04-22 13:02:10 +02:00