Commit Graph

79 Commits

Author SHA1 Message Date
Marc de Lima Lucio
447fdd542d Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_units_import_products 2017-07-18 10:30:43 +02:00
Marc de Lima Lucio
3a05b6a164 NEW add fk_unit field into product/service import/export 2017-07-18 10:20:16 +02:00
Regis Houssin
f745c87394 Fix: error during upgrade process 2017-07-11 21:27:51 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Laurent Destailleur
768df56c07 Uniformize name of standard PDF template 2017-05-04 20:16:55 +02:00
Laurent Destailleur
fb88eaf2a4 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
2017-02-23 02:55:50 +01:00
Laurent Destailleur
89b52e24f6 Fix menu navigation 2017-02-22 02:41:21 +01:00
Laurent Destailleur
c3fb559d3b Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/modProduct.class.php
2017-02-01 20:58:17 +01:00
Laurent Destailleur
5e4509953d Associated product must be on another export profile 2017-01-29 21:25:29 +01:00
Laurent Destailleur
1b1bab94ca More complete commit for #6114 2017-01-16 10:43:22 +01:00
Maxime Kohlhaas
edef8f883b Add update option on product module 2016-11-13 09:40:09 +01:00
Laurent Destailleur
287f9972a8 Merge branch 'new_no_default_rights' of
https://github.com/atm-maxime/dolibarr into
atm-maxime-new_no_default_rights

Conflicts:
	htdocs/langs/en_US/admin.lang
2016-09-30 13:04:14 +02:00
Laurent Destailleur
94dbe3da3f Fix the info if module are provided by module or not was wrong 2016-09-30 13:02:13 +02:00
Laurent Destailleur
9ebf7a1e35 Try to fix the group_concat function for pgsql. 2016-06-25 02:21:54 +02:00
Laurent Destailleur
453c6264bf FIX: Hidden option EXPORTTOOL_CATEGORIES was not working correctly 2016-06-24 02:19:41 +02:00
Maxime Kohlhaas
857454a28d For each module, no default permission on activation 2016-06-04 12:16:30 +02:00
Fixit Management
c3a5a7aab8 Rollback modification in this file 2016-04-19 12:54:46 +02:00
Laurent Destailleur
843dada35d Fix translation export/import 2016-02-22 17:42:41 +01:00
Laurent Destailleur
ef497e2129 Merge pull request #4669 from peckpeck/translation_import
Add support to product translation imports
2016-02-22 16:17:19 +01:00
Laurent Destailleur
77cbd885f2 NEW Add minimum stock and desired stock into import/export profiles.
NEW Add state into thirdparty export fields
2016-02-22 15:30:27 +01:00
Benoît Peccatte
c969b09ef7 Add support to product translation imports 2016-02-21 22:04:47 +01:00
Laurent Destailleur
277d92af75 Secure migration for people using a RC 2016-02-20 03:14:29 +01:00
Laurent Destailleur
36b0cb5b23 NEW Merge all admin tools (system and module admin tools) into same
entry "Admin tools", so now things are clear: All features restricted to
an admin user is inside "setup" (for setup) or "admin tools" (for action
tools) instead of 3 different entries.
2016-02-16 12:50:15 +01:00
Laurent Destailleur
d21908755e FIX Import/Export NPR VAT 2016-01-30 15:29:35 +01:00
Laurent Destailleur
1e1d6d4955 Fix to be able to use dolibarr with a smartphone 2016-01-03 19:34:19 +01:00
Laurent Destailleur
f5631cac45 NEW Introduce property module_position so a module can decide where it
appears into list of modules.
2015-11-17 00:58:12 +01:00
Laurent Destailleur
97096536b1 Fix #2526 The filter on type numeric is ok now. Sometimes we used
"Number", sometimes "Numeric". I moved to "Numeric" everywhere to solve
bug and added a warning in log if an unknow value is still used in code.
2015-09-12 15:20:55 +02:00
Florian HENRY
2a7f5da4a7 FIX : export SQL instruction on modProduct with extrafields 2015-08-04 11:49:26 +02:00
Marcos García de La Fuente
eff573e753 Removed duplicated code from core modules 2015-07-07 13:08:26 +02:00
Florian HENRY
daab394c81 add extrafields into import product 2015-06-24 12:40:56 +02:00
Laurent Destailleur
c90a86e4a4 Fix filters for exports 2015-04-02 16:58:36 +02:00
Laurent Destailleur
5ac63ec534 Solve fixme. 2014-10-03 02:00:50 +02:00
Regis Houssin
1541be8790 FIXME $key is not defined (strict mode) 2014-10-02 08:40:51 +02:00
Laurent Destailleur
5dc35ec137 Fix: Missing field tobuy into service export.
Fix: Filter on date into export.
Fix: Tooltip help.
2014-08-29 20:25:54 +02:00
Laurent Destailleur
4b9d1b901b Fix: [ bug #1401 ] Problème avec la génération des codes barres 2014-05-25 17:14:33 +02:00
Laurent Destailleur
b7f55ea99c Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/modAgenda.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/liste.php
2014-05-18 11:52:52 +02:00
Laurent Destailleur
d4534f4a0b Fix: [ bug #1384 ] Wrong name for import products and product prices 2014-05-11 17:52:16 +02:00
Marcos García de La Fuente
7b05944530 Corrected strings not translated and typos in English language 2014-05-11 13:14:45 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Laurent Destailleur
4154f07dfd New: Add a public url as a property for products/services. 2014-03-14 13:51:46 +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
Laurent Destailleur
96e7985266 Fix: Translation of menu entries must not be into admin lang file (We
don't want to load this file for common pages).
2014-02-19 02:27:13 +01:00
Laurent Destailleur
03d056319c Qual: Clean code for adding menu entries into Modules system admin
entry.
New: Add entry for admin page Mass barcode init.
2014-02-18 20:49:22 +01:00
Christophe Battarel
0bdcd108f5 Add supplier informations in product export (supplier name, supplier product ref and supplier unit price) 2014-01-16 11:04:56 +01:00
Laurent Destailleur
966f135316 Fix: Migration must load new boxes 2013-10-26 16:18:28 +02:00
Raphaël Doursenaud
4efe215b0c Qual: removed a bunch of duplicated array keys 2013-09-05 17:00:18 +02:00
Laurent Destailleur
85572a4bd1 New: Start to work on box for product distributions
Qual: Start to move code of dol_print_graph function into class
DolGraph.
2013-08-05 17:19:49 +02:00
Florian Henry
d5731dd310 [ task #165 ] Add export of multiprices 2013-07-18 10:47:08 +02:00
simnandez
4f9b5883df Fix: [ bug #916 ] Products complementary attributes, imports and
multicompany
Fix: [ bug #917 ] Missing field type in products complementary
attributes imports

No Changelog Update need, because complementary attributes is new in 3.4
2013-05-29 18:18:24 +02:00
BENKE Charles
3f6216e6d0 Update modProduct.class.php
Add filtering feature on extrafields
2013-04-30 13:12:54 +03:00