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

305 Commits

Author SHA1 Message Date
KreizIT
feae560aa3 Travis correction. 2014-03-05 11:28:40 +01:00
KreizIT
58f2bf078b -Add batch record management 
-Implements stock increase or decrease with batch number record on product's warehouse tab
 2014-03-05 10:54:07 +01:00
KreizIT
7f275dfbf4 - Add table modification for product (forget in step 1) 
- Add module for batch number management
- change dependency for stock and product
- change product class and fiche showing new select for batch managment on product
 2014-03-04 18:55:55 +01:00
Florian Henry
4cbdf32ae6 codesniffer 2014-02-23 17:21:26 +01:00
Florian Henry
46ae5d6e9c - New: Price management enhancement (multiprice level, price by 
customer, if MAIN_FEATURES_LEVEL=2 Price by qty)
- Fix: Project Task numbering rule customs rule works
 2014-02-23 16:16:47 +01:00
Laurent Destailleur
2e67bbc382 Maxi debug of barcode feature. 
New: Barcode format and mandatory requirement is checked.
New: Start to add new page for barcode init.
 2014-02-19 01:51:19 +01:00
Laurent Destailleur
908c39098d Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
 2014-02-16 19:47:51 +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
ce8d13ead0 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/comm/action/fiche.php
	htdocs/filefunc.inc.php
	htdocs/install/check.php
 2014-02-10 00:38:10 +01:00
Laurent Destailleur
bd25a98e03 New: Generation auto of barcode is available for product. 2014-02-10 00:24:20 +01:00
Laurent Destailleur
319b13dafb Fix: Field nature is not correctly filled. 2014-02-08 01:02:09 +01:00
aspangaro
bccf23711d Kill clics - Accountancy in product card - Not display accountancy_code when module (comptabilite | accounting | accounting expert) is disabled 2014-02-02 18:26:17 +01:00
Laurent Destailleur
ebd8d5f8dd New: Can input barcode during product creation step. 2014-01-28 19:11:22 +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
Laurent Destailleur
23e6709164 Better error message 2014-01-21 12:55:05 +01:00
Laurent Destailleur
cfd8601a70 Fix: Missing parent tables 2014-01-21 12:53:27 +01:00
Laurent Destailleur
5f65b2a97f Merge remote-tracking branch 'origin/3.5' into develop 2014-01-12 20:23:24 +01:00
Cédric Salvador
68e42bc24e fixed wrong thumbnails directory 2014-01-07 17:26:12 +01:00
Laurent Destailleur
0e62d79ce2 Merge remote-tracking branch 'origin/3.5' into develop 2013-12-26 19:43:31 +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
da569ea8d4 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:39:28 +01:00
Laurent Destailleur
aa4ae60826 Fix: sql where on an int must not contains ' 2013-12-10 18:54:44 +01:00
Laurent Destailleur
df779086a6 Fix: We should not load stock details at each product fetch 2013-12-10 18:04:25 +01:00
Laurent Destailleur
c78fc504af Fix: sql where on an int must not contains ' 2013-12-10 17:21:48 +01:00
simnandez
58a8f590e6 New: Add graph stats for suppliers orders in tab "stats" on products. 2013-11-22 14:47:16 +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
Laurent Destailleur
c87c7703cd Qual: Make code simpler. 2013-04-22 13:01:22 +02:00
Laurent Destailleur
5cbb0359aa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-22 10:33:46 +02:00
Laurent Destailleur
ee843924dd Fix: Some translation change to have things more clear. 2013-04-22 10:33:06 +02:00
Laurent Destailleur
7ff2e559aa Fix: PGsql compatibility 2013-04-22 01:59:52 +02:00
Laurent Destailleur
1f0adfaff5 Can remove an element from category when on category view. 2013-04-21 23:44:33 +02:00
fhenry
e2d0d0d414 Fix fix as Eldy wish it 2013-04-20 00:10:20 +02:00
Sébastien de Chateauvieux
aaaa5242d6 TVA NP : update price calculation 2013-03-25 17:42:48 +04:00
Laurent Destailleur
bc505c98a0 Test to avoid infinite loop 2013-02-19 21:10:31 +01:00
Laurent Destailleur
aff919fd10 Fix: Bad test 2013-02-17 12:45:46 +01:00
BENKE Charles
f847558363 Update htdocs/product/class/product.class.php 
fetch_prod_arbo / recursive call of the child product test
 2013-02-15 07:21:10 +01:00
BENKE Charles
f084bbbb19 Update htdocs/product/class/product.class.php 
bug on list of childs of product
if two products have the same label, the list display only one line
 2013-02-08 21:21:25 +01:00
Laurent Destailleur
56e11e52fa New: hookmanager class is used frequently and is a factory object, so we 
can move it during init of environment and use it globally.
 2013-01-25 19:12:54 +01:00
Laurent Destailleur
0e13b3872d Fix: Removed warnings 2013-01-19 14:32:37 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Regis Houssin
65090c582d Fix: checkstyle 2012-12-15 11:39:47 +01:00
Laurent Destailleur
f4459ee1f1 Fix: Regression detected by PHPUnit 2012-12-10 19:06:59 +01:00
fhenry
1d6bc23f4d - Uniformize Extrafield deletion for adherent,user,product,societe by 
using commonobject method
 - Add convertion of tms timestamp special case in mysql for pgsql
 2012-12-08 14:23:52 +01:00
Maxime Kohlhaas
69fa1e9d10 Fix : replace PRODUIT_PRICE_BY_QTY by PRODUIT_CUSTOMER_PRICES_BY_QTY 2012-12-01 14:38:59 +01:00
Maxime Kohlhaas
667c8cffae Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-11-14 11:02:35 +01:00
Regis Houssin
54d4661769 Fix: missing action type for hookmanager 2012-11-10 16:08:26 +01:00
Regis Houssin
57cce6f517 Fix: missing global 2012-11-09 19:34:05 +01:00
Regis Houssin
0e0582c16f Fix: avoid conflicts with external module if triggers used 2012-11-09 19:23:46 +01:00
Maxime Kohlhaas
7035ec42f1 Task # 559 : Modifications to store unitprice as in supplier prices 2012-11-07 00:38:53 +01:00
Maxime Kohlhaas
03cf96ed31 Task # 559 : add discount by qty as done in supplier prices 2012-10-25 08:18:59 +02:00
Maxime Kohlhaas
2ff77bb2f1 Task # 559 : no need for a max quantity 2012-10-24 17:18:11 +02:00
Maxime Kohlhaas
8ba55f49f1 Task # 559 : start of price by quantity management 2012-10-22 17:47:15 +02:00
Laurent Destailleur
0b4df34091 Fix: Blank page when renaming product ref 2012-09-19 14:16:29 +02:00
Laurent Destailleur
0e76bd7ac6 Fix: Blank page when renaming a product ref 2012-09-19 14:11:01 +02:00
Regis Houssin
ada85df649 Fix: wrong permission 2012-09-16 21:12:55 +02:00
Regis Houssin
e19f8c54f1 Fix: strict mode hurricane 2012-09-15 10:01:35 +02:00
Regis Houssin
ee1cf819f7 Fix: mass convert line delimiters 2012-09-07 17:23:16 +02:00
simnandez
a3ecb1203b New: Add PRODUCT_PRICE_MODIFY trigger 2012-09-05 14:38:16 +02:00
Laurent Destailleur
913b923886 Fix: error report when duplicate product 2012-09-02 15:09:48 +02:00