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

1208 Commits

Author SHA1 Message Date
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
Laurent Destailleur
8a74c928f3 Fix: regression 2012-08-28 23:01:04 +02:00
Laurent Destailleur
fd00b16b19 Fix: Bad log format 2012-08-26 18:28:59 +02:00
Regis Houssin
d88abe8df0 Fix: use label instead libelle 2012-08-25 12:07:18 +02:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Laurent Destailleur
2620abc6a0 Use different class for a and img 2012-08-08 20:46:50 +02:00
Laurent Destailleur
0d346ac1c1 New: A module can add several css and several js. 
New: Removed lightbox as it is not compatible with GPL.
 2012-08-08 20:43:23 +02:00
Marcos García
5a73c32f46 Migrated ClassName to __construct() function 
Changed $DB to $db
lower-cased "Class"
 2012-07-30 17:17:33 +02:00
Regis Houssin
20ed6bd5c5 Fix: Bug #460 - Wrong entity assignment when creating a warehouse 2012-07-26 20:52:05 +02:00
Regis Houssin
c6cd17cf3f Fix: strict mode... far away 2012-07-24 17:52:46 +02:00
Regis Houssin
d5ff308992 Fix: declare $mesg and $mesgs in main.inc.php 
Fix: strict mode be back
 2012-07-23 20:52:55 +02:00
Laurent Destailleur
f5b58b6f12 Fix: Missing fields into insert from webservice 2012-07-19 14:26:02 +02:00
Laurent Destailleur
d07e68e12f Fix: Combo list of warehouse not saved. 
Fix: Validate of shipment in error
when using not predefined products.
 2012-07-17 01:22:19 +02:00
Regis Houssin
66b2f630ac Fix: big avoid strict mode errors 2012-07-09 12:31:21 +02:00
Regis Houssin
887f210618 Fix: avoid warning with php 5.4 and strict mode 2012-07-08 23:22:22 +02:00
Regis Houssin
454aa69697 Fix: missing images files filter 2012-07-03 21:13:09 +02:00
Regis Houssin
6f1651309e Fix: global converting lines delimiter 2012-07-02 19:30:37 +02:00
Regis Houssin
c69fa495fa Fix: compatibility with multicompany 2012-07-02 15:42:35 +02:00
Regis Houssin
f4135d3758 Fix: delete or rename a document product dir 2012-06-08 21:40:27 +02:00
Regis Houssin
355cb988b7 Fix: missing oldcopy during update 2012-06-08 21:40:15 +02:00
Laurent Destailleur
59e39b5d91 Fix: A lot of pb into javascript. Javascripts code for same feature was 
not inserted always at same place (sometinmes at low level, and
sometimes at high level). This was creating conflict into javascript.
 2012-06-08 21:33:12 +02:00
Regis Houssin
e6c6d6cf84 Fix: avoid warning 2012-06-08 18:17:03 +02:00
Laurent Destailleur
161846be77 Fix: [ bug #397 ] Product VAT is not coming from buying price 2012-05-08 22:10:07 +02:00
Laurent Destailleur
a772fff5ed Fix: update price for pgsql 2012-05-08 21:59:02 +02:00
Regis Houssin
73487a6aec Fix: replace mktime() by dol_now() 2012-04-30 15:01:25 +02:00
Regis Houssin
94788e2ccb Fix: compatibility with multicompany sharings 
use new $conf->product->dir_output[$object->entity] instead
$conf->product->dir_output
 2012-04-06 22:41:33 +02:00
Regis Houssin
3c794967c3 Fix: multiple avoid warning with php strict mode 2012-03-23 17:18:33 +01:00
Laurent Destailleur
aea97075f1 Fix: Fix some bugs (phpunit is now ok with pgsql too) 2012-03-11 21:45:17 +01:00
Regis Houssin
68ce569d05 Fix: compatibility with edit in place 
Qual: use generic function and remove unused
Todo: Type of product combobox is not compatible with edit in place
 2012-03-04 09:43:56 +01:00
Laurent Destailleur
00b7ad4a78 New: Can convert a product/service into service/product. 2012-03-04 01:41:36 +01:00
Laurent Destailleur
f5c551d725 New: Can use personalized fields of products/services. 2012-03-03 19:02:44 +01:00
Regis Houssin
9301def08d Fix: rename method 2012-03-02 15:03:14 +01:00
Laurent Destailleur
489c00fa9f Fix: Trigger for delete must be done in opposite order than trigger for 
create.
 2012-02-22 12:37:39 +01:00
Laurent Destailleur
c4b845d60a Qual: Removed deprecated function name. 2012-02-19 18:34:22 +01:00
Regis Houssin
70bd56bea8 Fix: remove alias 2012-02-16 16:26:55 +01:00
Regis Houssin
cd3452d71d Fix: multicompany sharings and uniformize code 2012-02-11 10:18:09 +01:00
Regis Houssin
c6e4206907 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-02-01 11:33:11 +01:00
Regis Houssin
4431510ce4 Fix: use entity field of object 2012-02-01 11:32:55 +01:00
Laurent Destailleur
ed4a0742c8 Add a test to be sure module is on 2012-01-31 00:51:52 +01:00
Laurent Destailleur
8c934d3dde Rename custom code into customs code 2012-01-30 20:08:11 +01:00
Regis Houssin
288e9deed3 Fix: trigger problem 2012-01-14 20:23:47 +01:00
Regis Houssin
9339119455 New: use getEntity() instead $conf->entity 2012-01-11 21:16:10 +08:00
Laurent Destailleur
16c6dd3c95 Doxygen 2012-01-04 13:54:07 +01:00
simnandez
565f390d14 Qual: Uniformize code 2011-12-19 18:24:49 +01:00
Laurent Destailleur
1aa75b847b New: dol_trunc has an option to make "exact" truncation (without adding 
... if truncation is done).
 2011-12-17 16:44:48 +01:00
Laurent Destailleur
cda132ea8c Qual: Some change to have graph lib able to use img disk generation 
libraries like javascript libraries.
 2011-12-17 15:55:49 +01:00
Laurent Destailleur
8fb4108163 Qual: childelement is a protected property 2011-12-07 19:22:12 +01:00
Laurent Destailleur
66856fee75 New: show thirdparty barcode on main tab. 2011-12-07 15:06:29 +01:00
Laurent Destailleur
740c24e991 New: barcode is now visible on main tab. 2011-12-07 12:58:39 +01:00
Laurent Destailleur
b52fc32853 Fix: fix not initialized variables 2011-12-05 19:41:38 +01:00
Laurent Destailleur
ad3f13881b Uniformize constructor 
Removed deprecated functions
 2011-10-27 02:10:23 +02:00
Regis Houssin
56d6cbe56f [task #216] Move lib in core directory 2011-10-24 12:59:44 +02:00
Regis Houssin
63d60a33fc [task #216] Move lib in core directory 2011-10-24 11:25:54 +02:00
Regis Houssin
c65238b773 [task #216] Move lib in core directory 2011-10-24 10:45:06 +02:00
Laurent Destailleur
0bc80e9bec Qual: Doxygen 
Qual: Uniformize some code
 2011-10-14 18:51:20 +02:00
eldy
c43c2734fb Fix: TVA Non Perçue Récupérable 2011-10-09 17:37:27 +02:00
eldy
6eea1f56c9 More comments. 2011-10-05 14:29:16 +02:00
eldy
b295a866a5 Fix: Fix a serious database default. Table llx_product_fournisseur was 
linked with llx_product_fournisseur_price with a link 1-1 so was
useless. I removed it. This reduce a lot of sophisticated code and will
make import of prices easier. This also increase speed.
 2011-10-05 12:51:55 +02:00
eldy
47bb2171e0 Fix: Fix a serious database default. Table llx_product_fournisseur was 
linked with llx_product_fournisseur_price with a link 1-1 so was
useless. I removed it. This reduce a lot of sophisticated code and will
make import of prices easier. This also increase speed.
 2011-10-04 01:26:07 +02:00
eldy
409fd169cf New: Add webservice to create a product 2011-10-02 01:23:57 +02:00
eldy
b2d635dab7 Qual: More PHPUnit tests 2011-10-01 01:40:15 +02:00
eldy
f70b1894db Work on product webservice 2011-10-01 01:30:32 +02:00
Laurent Destailleur
be6286c4b8 Qual: More POO. 
Qual: Doxygen
 2011-09-20 17:19:46 +00:00
Regis Houssin
551e1f81bf Fix: Space after closing parenthesis of function call prohibited 2011-09-20 13:32:16 +00:00
Regis Houssin
6c4acefd93 Fix: Space before opening parenthesis of function call prohibited 2011-09-20 12:56:06 +00:00
Regis Houssin
2c1b3722f2 Fix: replace sizeof() by count() 2011-09-17 19:49:50 +00:00
Laurent Destailleur
17c32809e8 Qual: Removed TODO and some useless code 2011-09-13 12:00:37 +00:00
Laurent Destailleur
b75d19c264 Qual: Uniformize constructors 2011-09-11 18:35:38 +00:00
Laurent Destailleur
2721c9fda2 New: Links on composition page reach to composition page 2011-09-07 19:18:28 +00:00
Laurent Destailleur
351a2974dd Doxygen 2011-09-03 00:14:27 +00:00
Laurent Destailleur
044879c838 Doxygen 2011-09-02 23:57:26 +00:00
Laurent Destailleur
0e2946cec7 Doxygen 2011-09-03 00:19:56 +00:00
Laurent Destailleur
e5988ad241 Fix: Error management when adding notification 2011-09-02 23:41:55 +00:00
Laurent Destailleur
2d89e6609e Doxygen 2011-09-03 00:14:27 +00:00
Laurent Destailleur
5be5852cf4 Fix: Third party emails must not be visible into notification page 2011-09-02 23:07:47 +00:00
Laurent Destailleur
42c86ce1ac Work on rpm package 2011-09-03 01:46:33 +00:00
Juanjo Menent
cac55067fb Qual: Uniformize code 2011-09-02 22:33:28 +00:00
Laurent Destailleur
55c5c5f9f5 Work on rpm package 2011-09-03 01:27:00 +00:00
Laurent Destailleur
f5f37fa8dc Qual: Uniformize code 2011-09-02 16:33:11 +00:00
Laurent Destailleur
d53b179102 Fix: Fix GNU address 
Doxygen
 2011-09-03 01:24:09 +00:00
Laurent Destailleur
f39c932b2e Qual: Uniformize code 2011-09-02 16:25:07 +00:00
Laurent Destailleur
26badd59f4 Doxygen 2011-09-03 00:27:02 +00:00
Juanjo Menent
116e215323 Uniformize code 2011-09-02 15:41:35 +00:00
Laurent Destailleur
1ca46d8ec4 Doxygen 2011-09-03 00:19:56 +00:00
Juanjo Menent
8f19ee66e4 Uniformize code 2011-09-02 14:31:53 +00:00
Laurent Destailleur
d1d145620d Doxygen 2011-09-03 00:14:27 +00:00
Laurent Destailleur
be5333589e Fix: task #11248 : there is no DB transaction on products->delete 
Qual: Mutualize code to see of an object as child
 2011-08-28 12:57:23 +00:00
Laurent Destailleur
058636e01b Qual: Clean deprecated code 2011-08-28 12:37:39 +00:00
Laurent Destailleur
5823f60fd7 Fix: task #11248 : there is no DB transaction on products->delete 
Qual: Mutualize code to see of an object as child
 2011-08-28 12:30:15 +00:00
Laurent Destailleur
3562f6bba0 Fix: task #11248 : there is no DB transaction on products->delete 2011-08-28 11:53:06 +00:00
Laurent Destailleur
0e6eb2aada Qual: Try to uniformize code for product canvas to wokr like canvas for third parties. This also reduce seriously the "cyclomatic complexity" reported by quality tools on product/fiche.php file. 2011-08-27 17:25:09 +00:00
Regis Houssin
27300fe898 Fix: remove obsolete tags (in progress) 2011-08-27 16:15:06 +00:00
Juanjo Menent
8442baa6f0 task #11240: Show parent products when product is a sub product 2011-08-18 16:16:04 +00:00
Laurent Destailleur
0adbca4625 Qual: Mutualize a lot of duplicate functions into functions.lib.php 2011-08-17 15:56:22 +00:00
Laurent Destailleur
d246b87c1a Fix: removed print of function making print. 
Fix: default vat rate must be -1 to be automatic instead of deprecated conf->defaulttx
 2011-08-04 21:46:50 +00:00
Laurent Destailleur
37ead2f97e Fix: Avoid errors into rpm packages 2011-07-31 23:19:04 +00:00
Laurent Destailleur
13e3cc77b9 Fix: Uniformize error management 2011-07-29 20:47:34 +00:00
tiaris
ddbad84dd7 canot delete product with supplier refs 2011-07-29 06:59:36 +00:00
Philippe Grand
cc1329b108 Doxygene 2011-06-10 11:39:01 +00:00
Laurent Destailleur
bc25b7bd2c Qual: Removed deprecated feature 2011-06-08 12:48:05 +00:00
Laurent Destailleur
678a64c591 New: Add more information on stock values. 2011-05-22 02:14:01 +00:00
Regis Houssin
a807c5b391 Works on paypal module 
Fix: fetch product return 0 if no result
 2011-05-21 08:01:23 +00:00
Regis Houssin
e0fe945afd Works on paypal module 
Fix: uniformize code
 2011-05-21 07:12:21 +00:00
Laurent Destailleur
39bcf8bd63 Doxygen 2011-05-18 16:42:59 +00:00
Laurent Destailleur
9e29d6cf9f Doxygen 2011-05-18 16:20:43 +00:00
Laurent Destailleur
af9a65f7a4 Add a TODO 2011-05-17 08:47:34 +00:00
Regis Houssin
b523ab815a Fix: problem to delete a service if the product module is disable 2011-05-15 17:00:18 +00:00
Regis Houssin
781fe52b39 New: not reload page with dialog confirm 
Fix: problem with external module constraint
 2011-05-14 14:35:04 +00:00
Laurent Destailleur
2d4c3466d8 Test to add jlightbox 2011-05-11 22:53:40 +00:00
tiaris
580817964e Correct add_photo_web method 2011-05-04 13:37:19 +00:00
Regis Houssin
1946961a20 New: change for ajax dialog box in product card 
Fix: uniformize code
 2011-04-25 20:18:09 +00:00
Laurent Destailleur
50d39ca248 Fix: Removed warning 2011-04-19 22:25:06 +00:00
Regis Houssin
2bea3ee5cc New: works on sharings between entities 
Fix: we check if all dependencies are ok
 2011-04-18 15:54:13 +00:00
Regis Houssin
a33988dc14 Fix: missing product triggers 2011-04-06 13:29:46 +00:00
Laurent Destailleur
e9f4879245 Qual: Prepare move of function dol_delete_file into file.lib.php 2011-03-09 15:34:57 +00:00
Regis Houssin
3b4ea76538 Fix: compatibility with pgsql, replace all addslashes by $this->db->escape in class 2011-02-24 18:11:12 +00:00
Laurent Destailleur
b5e5dc3849 Fix: Fix regression by adding "custom" feature making web server hang in infinite loop. 2010-12-15 18:15:08 +00:00
Laurent Destailleur
f6dade1093 Try to comment deprecated code to reduce code and keep only one pattern of development for canvas. 2010-11-11 11:15:06 +00:00
Laurent Destailleur
f8674ae32f Prepare code to have photo_resize used by other modules 2010-11-07 12:33:32 +00:00
Laurent Destailleur
49bd52c4ab Fix: Bad link 2010-11-04 19:05:05 +00:00
Laurent Destailleur
d65528aec9 New: Add custom code and origin country 2010-11-02 11:22:41 +00:00
Laurent Destailleur
7917c17844 Work on task #10579 : Simplify code using editor 2010-09-02 19:10:34 +00:00
Regis Houssin
d97c1054f1 Works on canvas integration in third party module 2010-09-01 09:19:03 +00:00
Philippe Grand
b6d0f859af task #6689, strlen problem 
replace  strlen with dol_strlen
 2010-08-24 19:51:56 +00:00
Laurent Destailleur
f9eabf9966 Add status (tosell/tobuy) on stock list 2010-08-19 21:19:51 +00:00
Laurent Destailleur
a60cece2de Add status (tosell/tobuy) on stock list 2010-08-19 20:58:08 +00:00
Juanjo Menent
03dcfb0443 Task #9643: Works in Products 2010-08-12 16:19:52 +00:00
Laurent Destailleur
5affcd3b3f Qual: Renamed french field "envente" into "tosell". 2010-08-11 18:35:31 +00:00
Laurent Destailleur
688bdf8b1d New: Support NPR in customer product prices 2010-08-09 19:08:22 +00:00
Laurent Destailleur
186622e235 Fix: Database compatibility 2010-08-09 16:07:24 +00:00
Laurent Destailleur
c23a8e5c5d Removed deprecated function 2010-08-04 23:55:05 +00:00
Laurent Destailleur
fc2213a8f1 Doxygen 2010-07-21 12:35:56 +00:00
Laurent Destailleur
f55d82dee5 Fix: A lot of fix in stock value calculation. 2010-07-14 15:41:39 +00:00
Laurent Destailleur
359038d2e5 Fix: Move table in wrong repository 2010-07-10 23:13:28 +00:00
Laurent Destailleur
a4f95ead07 Fix on shipping module 2010-06-17 20:24:11 +00:00
Laurent Destailleur
d2d63bcb81 Fix: Fix a lot of broken features when renaming produit to product 2010-06-02 08:34:44 +00:00
Laurent Destailleur
4b7d4fa571 Fix a lot of bugs after changes for canvas (photo hidden, edit field for accountancy disappeared, etc...). Too complicated to fix with canvas so I restore the "simple" code. Canvas feature should still works but with some bugs. 2010-05-26 14:52:32 +00:00
Regis Houssin
cd27d9463b Works on product canvas and templates 
!! WARNING : not stable !!
 2010-05-02 14:50:08 +00:00
Laurent Destailleur
968addfad3 Fix: Better error management in upload files 2010-05-01 14:28:48 +00:00
Regis Houssin
2f924a3f7a Works on product canvas and templates 
!! WARNING : not stable !!
 2010-05-01 10:40:42 +00:00
Regis Houssin
230a414a2c Works on product canvas and templates 
!! WARNING : not stable !!
 2010-05-01 09:03:15 +00:00
Philippe Grand
391c595dda according to new tree directory 2010-04-29 08:50:46 +00:00
Philippe Grand
b65ddfabe8 according to new tree directory 2010-04-28 21:29:12 +00:00