Laurent Destailleur
a1567778ab
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/tpl/objectline_create.tpl.php
htdocs/fourn/commande/card.php
2015-03-06 18:51:55 +01:00
Laurent Destailleur
77dd07c846
Fix thumbs generation
2015-03-06 13:12:33 +01:00
Laurent Destailleur
b888a04af9
Reduce a lot of duplicate code. Move all tables of extrafields setup
...
into a tpl file.
2015-02-28 20:14:26 +01:00
Marcos García de La Fuente
2ba795fcbc
NEW: [ task #851 ] Add a new field: Commercial name
2015-02-28 14:30:06 +01:00
Laurent Destailleur
ef14e4e7ed
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/fourn/class/fournisseur.product.class.php
2015-02-28 03:11:15 +01:00
Laurent Destailleur
4bde7e9f51
Fix: Missing error management
2015-02-26 14:25:30 +01:00
Laurent Destailleur
e3713c8b6d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/admin/tools/eaccelerator.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/dispatch.php
2015-02-19 00:01:26 +01:00
Marcos García de La Fuente
ca939bf8a5
PHPDoc and misc fixes for several folders
2015-02-10 11:02:11 +01:00
Laurent Destailleur
4fdc287717
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/accountancy/customer/card.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/admin/menus.php
htdocs/fourn/commande/card.php
htdocs/install/check.php
2015-01-30 15:53:06 +01:00
Laurent Destailleur
ad68b3ca6c
Fixed approve during validation if user has permission
...
Fixed error management
Fixed rendering country must be same for all tabs.
2015-01-25 00:59:46 +01:00
frederic34
f4161b457b
Add dol_escape_htmltag and start to adapt boxes
2015-01-22 00:23:55 +01:00
frederic34
1b0dd671b3
Add tooltip in getNomUrl link
2015-01-20 21:40:33 +01:00
Laurent Destailleur
c54355b63a
Merge remote-tracking branch 'origin/3.7' into develop
2015-01-16 10:44:41 +01:00
Laurent Destailleur
e20c1decdf
Fixed: object instead of soc and vis versa.
2015-01-15 03:51:47 +01:00
frederic34
60661ae948
Add some "classfortooltip"
2015-01-09 00:07:54 +01:00
aspangaro
c4c69e191b
Replace <center> tags
2014-11-25 20:13:43 +01:00
Laurent Destailleur
c186f13218
Fix: Param $action was not defined.
...
A better fix must be done later be removing useless hooks that are
duplicate with triggers.
2014-11-15 19:04:21 +01:00
Laurent Destailleur
445f696d28
Fix: Pb of object with wrong type.
2014-11-15 18:24:38 +01:00
Laurent Destailleur
58c06264e4
Merge branch 'develop' of github.com:BadPixxel/dolibarr into
...
BadPixxel-develop
Conflicts:
htdocs/langs/en_US/categories.lang
htdocs/langs/fr_FR/categories.lang
2014-11-15 12:17:46 +01:00
BadPixxel
8fc5faf4a8
Minor BugFix : Missing delete Category Multilangual fields
...
Delete of Multilangual fields was missing, impossible to delete category.
Fixed Error :
Cannot delete or update a parent row: a foreign key constraint fails (`Dol-3.6`.`llx_categorie_lang`, CONSTRAINT `fk_category_lang_fk_category` FOREIGN KEY (`fk_category`) REFERENCES `llx_categorie` (`rowid`))
2014-11-10 16:29:05 +01:00
Laurent Destailleur
8d937d2d36
Uniformize position of "Create link" on categories.
2014-10-19 20:37:46 +02:00
Laurent Destailleur
9b24cccd0b
Fix: Better layout detection
2014-10-19 12:24:36 +02:00
Laurent Destailleur
7a68d9a940
Miscellaneous fixes
2014-10-16 20:55:13 +02:00
Laurent Destailleur
9768550696
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
htdocs/categories/fiche.php
htdocs/comm/action/index.php
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/fourn/fiche.php
htdocs/product/composition/fiche.php
htdocs/product/price.php
htdocs/projet/tasks/task.php
htdocs/projet/tasks/time.php
2014-10-12 02:54:34 +02:00
Laurent Destailleur
31a96aa4c6
Fix: CRLF
2014-10-09 17:18:14 +02:00
Laurent Destailleur
f9377a4715
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-10-08 20:57:11 +02:00
Laurent Destailleur
2bbede6465
New: Can add product into category from category card.
2014-10-07 21:39:10 +02:00
Regis Houssin
a2446e51db
New: add context "globalcard" for declaring only once all cards
2014-10-06 07:20:58 +02:00
Florian HENRY
4b28ff005e
Return error message on category creation failure
2014-10-02 15:24:40 +02:00
Regis Houssin
4248c7bed2
Fix: strict mode paradise
2014-10-02 09:30:31 +02:00
BadPixxel
f178aa65ca
removed "thumb\" subdir addition
...
Category Image Thumb sub-folder now directly added by function liste_photos
2014-09-30 19:43:21 +02:00
BadPixxel
d6c8f65dad
Minor BugFix : Missing thumbs folder in Category Images List
...
Sub-folder for thumbs was missing in category image list, url was wrong....
2014-09-30 19:37:13 +02:00
BadPixxel
820e6e5d95
Minor BugFix : Compatibility of function getNomUrl
...
Using Ref & Label for Category Name display is necessary for compatibility
2014-09-30 19:01:43 +02:00
BadPixxel
f3eec7582e
Minor BugFix : Wrong variable reference in getNomUrl
...
Display of Category Url was incompete due to reference to "$ref" instead of "$label"
2014-09-30 16:00:04 +02:00
Laurent Destailleur
ec95aacd52
Uniformize code for error reporting after a hook.
2014-09-28 03:41:32 +02:00
Laurent Destailleur
5fdd798e91
Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on
...
parameter).
2014-09-27 17:13:15 +02:00
aspangaro
1592968709
Merge remote-tracking branch 'Upstream/develop' into develop
2014-09-20 06:42:31 +02:00
Laurent Destailleur
ee4d697172
Fix several bugs reported by scrutinizer
2014-09-19 14:57:31 +02:00
aspangaro
0b20369dd7
Qual: Renamed all files & links "fiche.php" into "card.php"
2014-09-18 21:18:25 +02:00
aspangaro
b22aef3521
Qual: Renamed all files & links "liste.php" into "list.php"
2014-09-18 20:33:37 +02:00
Laurent Destailleur
342e26f679
Merge
2014-09-07 12:22:04 +02:00
Laurent Destailleur
31eb4bda88
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/compta/facture.php
2014-09-06 00:26:11 +02:00
Laurent Destailleur
576512e339
Merge pull request #1815 from GPCsolutions/catbug
...
Fix categories bug
2014-09-02 19:05:05 +02:00
Florian HENRY
0473bc5138
Fix missing $user into create call categorie
2014-09-01 11:51:16 +02:00
Florian HENRY
bff33166a5
Fix missing $user in create method
2014-09-01 11:49:44 +02:00
Raphaël Doursenaud
739d309a0d
Updated category fix
...
Categories ID can be passed as strings
PSR code formatting
2014-08-14 08:46:51 +02:00
Raphaël Doursenaud
1a9e98cda9
Fix categories bug
...
When using the string type,
$typeid == 1 matched all strings making other conditions ineffective.
2014-08-14 08:33:39 +02:00
KreizIT
c94c0699d8
Fix : [ bug #1549 ] Itïs not possible add ExtraFields
2014-08-06 17:38:44 +02:00
Maxime Kohlhaas
d8ede4147d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2014-07-31 11:55:36 +02:00
Maxime Kohlhaas
d8cf23ad95
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2014-07-29 15:46:50 +02:00
Raphaël Doursenaud
6bff4dde77
Fix categories creation
2014-07-29 11:15:32 +02:00
Laurent Destailleur
c895c892a5
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
2014-07-29 01:17:00 +02:00
Maxime Kohlhaas
f61e9ecc04
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2014-07-28 13:33:39 +02:00
Francis Appels
df5d4795bf
Fix on bugfix#1317, clean parameters missing
...
Clean fk_parent before updating fk_parent
2014-07-25 22:37:23 +02:00
Maxime Kohlhaas
386022947a
Categorie class was fetching an object even if no param passed
2014-07-25 14:11:31 +02:00
Maxime Kohlhaas
108cf11c8b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2014-07-24 09:01:54 +02:00
Maxime Kohlhaas
d2b2f29e4b
Start to replace all $conf->entity by getEntity()
2014-07-24 09:01:47 +02:00
Marcos García de La Fuente
43597c1731
Migrated old error notifications to the """new""" system
2014-07-20 01:43:46 +02:00
Marcos García de La Fuente
ac824728bc
Migrated old error notifications to the """new""" system
2014-07-20 01:09:43 +02:00
Marcos García de La Fuente
ec661d0c6c
Removed index.php and replaced them with blank index.html as it is more appropriate
2014-07-12 23:18:57 +02:00
Laurent Destailleur
94cd8debeb
Fix: table declaration
...
Fix: regretion into trigger management
2014-07-08 21:24:36 +02:00
Laurent Destailleur
90a5f6c7ef
Qual: Remove end php tag.
2014-07-08 01:02:30 +02:00
Laurent Destailleur
be4fe3d0d0
Merge branch 'syslog' of github.com:marcosgdf/dolibarr into
...
marcosgdf-syslog
Conflicts:
htdocs/contrat/class/contrat.class.php
htdocs/fichinter/class/fichinter.class.php
htdocs/projet/class/project.class.php
htdocs/projet/class/task.class.php
2014-07-04 13:43:50 +02:00
KreizIT
07f2d9474e
FIX: [ bug #1494 ] CATEGORY_CREATE and CATEGORY_MODIFY triggers do not intercept trigger action
2014-07-03 15:52:37 +02:00
Marcos García de La Fuente
7e1cf124b8
Merge branch 'develop' into syslog
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/product/class/product.class.php
htdocs/product/stock/lib/replenishment.lib.php
htdocs/societe/soc.php
2014-07-02 21:20:02 +02:00
aspangaro
e469755d29
Divers
2014-06-16 06:17:46 +02:00
Marcos García de La Fuente
56abf1cd72
Removed duplicated SQL error logging
2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
88cd5dec40
More substitutions
2014-06-13 01:42:00 +02:00
Marcos García de La Fuente
ca0a6cb307
Removed SQL string from call debug log
2014-06-13 01:34:39 +02:00
Marcos García de La Fuente
7e7958cf73
Removed SQL errors as they are logged by the database handler
2014-06-12 13:49:05 +02:00
Marcos García de La Fuente
9fbd7806f0
More substitutions
2014-06-12 11:31:53 +02:00
Laurent Destailleur
9f795331f5
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/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/compta/paiement_charge.php
htdocs/compta/sociales/charges.php
htdocs/core/db/mysql.class.php
htdocs/filefunc.inc.php
htdocs/societe/class/societe.class.php
2014-05-06 23:58:17 +02:00
Laurent Destailleur
503924fbbc
Fix: Missing cleaning orphelins for contact categories.
2014-05-06 21:56:31 +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
4cb671f4db
Qual: Clean deprecated code.
2014-04-28 11:55:08 +02:00
jfefe
dbaddd1fbd
Add translation support into categories arbo
2014-04-25 15:36:37 +02:00
jfefe
098fa7027c
Remove unused note into category translation
2014-04-25 15:36:00 +02:00
jfefe
d256799abf
Work on adding catgory translation
2014-04-25 15:17:12 +02:00
jfefe
b2b8fbb227
Fix : bad call of extrafields into categories
2014-04-25 14:28:22 +02:00
Laurent Destailleur
7ac193bb80
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/opensurvey/public/choix_autre.php
2014-04-02 11:41:55 +02:00
Cedric
df5a009aa2
FIX : [ bug #1317 ] Removing a category does not remove all child categories
2014-04-01 16:21:20 +02:00
Laurent Destailleur
a05ea58181
Fix: form to add images should not show link form
2014-03-18 22:26:46 +01:00
Laurent Destailleur
c936638eae
Fix: form to add images should not show link form
2014-03-18 00:41:56 +01:00
Laurent Destailleur
80088c87ac
Fix: Some debugs of module categories
2014-03-18 00:20:39 +01:00
Jean-François Ferry
5034356899
Manage extrafields deletion on categories
2014-03-16 16:06:32 +01:00
Jean-François Ferry
e2b47b9919
Category extrafields on categories: edit and view
2014-03-16 16:04:18 +01:00
Jean-François Ferry
d9baae3456
Implement extrafields into category create
2014-03-16 15:25:13 +01:00
Jean-François Ferry
f14d2fbfe0
Add information message for option into categories setup
2014-03-16 15:00:10 +01:00
Jean-François Ferry
55750e16d8
Prepare extrafields into categories
2014-03-16 14:48:46 +01:00
Jean-François Ferry
7e6777f344
Fix: bad id when deleting picture on categorie / missing lang
2014-03-16 13:49:44 +01:00
Maxime Kohlhaas
3131b92988
Fix bug 1293 : numbering failed
2014-03-14 23:18:46 +01:00
Maxime Kohlhaas
b9fbdffab2
Fix bug 1298 : category nav on member
...
modified: htdocs/categories/categorie.php
2014-03-14 22:56:54 +01:00
Laurent Destailleur
18f90520cf
Uniformize fields shown
2014-02-19 02:19:54 +01:00
Laurent Destailleur
1fd67807ce
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-18 01:13:29 +01:00
Laurent Destailleur
0725fea923
Fix: doxygen
2014-01-15 03:08:11 +01:00
Cédric Salvador
ecfff5636b
rename is_in_cat to containsObject
2014-01-13 09:27:10 +01:00
Cédric Salvador
abe76708de
renamed object_exists
2014-01-13 09:06:00 +01:00
Cédric Salvador
e7f7dd49a5
add a method to check for the presence of an object in a category
2014-01-13 09:06:00 +01:00
Laurent Destailleur
51b455b85a
Start to normalize code for category to not use named table, columns but
...
only type of category.
2014-01-12 15:54:28 +01:00
Laurent Destailleur
4d379e572a
Fix: Bugs into permissions for module category
2014-01-07 15:35:26 +01:00
Laurent Destailleur
89c772459f
Fix: Bugs into permissions for module category
2014-01-07 14:55:03 +01:00
simnandez
fca35cb8b0
Fix: Bad url destination into category remove
2013-12-24 13:40:54 +01:00
simnandez
8c9d145759
Fix: Bad url destination into category remove
2013-12-24 13:39:58 +01:00
Laurent Destailleur
00b0031ddf
Fix: If no permission to edit object, form to change category must be
...
hidden
Fix: Adding supplier category was saved into wrong table.
2013-11-21 16:34:38 +01:00
Laurent Destailleur
a7d0357d5d
Fix: If no permission to edit object, form to change category must be
...
hidden
Fix: Adding supplier category was saved into wrong table.
2013-11-21 16:26:56 +01:00
Laurent Destailleur
065c87d81c
Qual: uniformize code: property ->tel on objects is now ->phone
...
everywhere
2013-09-25 19:58:22 +02:00
Laurent Destailleur
c151ef7b87
Qual: Remove duplicate form instanciation.
2013-09-06 12:10:09 +02:00
Laurent Destailleur
91718bc902
Qual: Replace deprecated call ->form_confirm with ->formconfirm
2013-09-06 11:51:24 +02:00
Raphaël Doursenaud
cd684460ff
Removed silly code
2013-09-05 17:30:17 +02:00
Laurent Destailleur
10c2bdc193
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/core/boxes/box_ficheinter.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/langs/fr_FR/compta.lang
2013-09-04 15:13:38 +02:00
Laurent Destailleur
c5020056b3
Revert commit.
...
Bug into update function. Also what was difference of new field ?
2013-09-03 18:18:22 +02:00
Grand Philippe
9f01aa51a3
fix regression
2013-09-03 15:19:03 +02:00
Grand Philippe
397d0e3b81
Add an additional description for the category products
2013-09-03 15:12:15 +02:00
simnandez
58e2c4e38e
Fix: compatiblity with multicompany module
2013-09-02 10:08:38 +02:00
simnandez
83042459a5
Fix: compatiblity with multicompany module
2013-09-02 10:07:44 +02:00
Laurent Destailleur
327aa80ed0
Fix: Error management
...
New: Autoselect category in list if there is only one element in list.
2013-08-21 13:02:33 +02:00
Laurent Destailleur
c4bc10b8eb
Qual: Clean code by moving synchro with mailman into mailman trigger
...
New: A trigger can return an array of error strings instead of one error
string.
2013-08-21 12:39:20 +02:00
Laurent Destailleur
8e5537f1ce
New: Add trigger CATEGORY_LINK and CATEGORY_UNLINK.
2013-08-10 02:40:11 +02:00
Florian Henry
325ceda4dc
[ task #1014 ] Add option to recursivly add parent cactegory
2013-07-31 21:52:49 +02:00
Florian Henry
3a2f76512b
Category contact again
2013-07-30 17:28:08 +02:00
Florian Henry
60bb595248
Finnalise categorie contact
2013-07-30 17:24:27 +02:00
Florian Henry
44b3ebbeb4
Contniue categorie on contact
2013-07-30 17:11:42 +02:00
Florian Henry
1260a9fd7c
Complete categorie contact
2013-07-30 17:04:09 +02:00
Laurent Destailleur
73edad8b88
Fix: Bad translation and picto
2013-07-29 10:29:12 +02:00
Laurent Destailleur
d802470aae
I killed <td nowrap>. Hello <td class="nowrap"> !
2013-07-19 14:23:42 +02:00
Florian Henry
c518aa1019
Add translation
2013-07-16 21:11:06 +02:00
Florian Henry
e07eac9b17
[ task #519 ] Add category association with contacts
2013-07-16 21:04:58 +02:00
Regis Houssin
05bd035488
Fix: convert line delimiters
2013-06-24 17:34:22 +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
9b30f116f1
Fix: Some lib missing when jmobile enabled.
2013-05-10 12:48:11 +02:00
Laurent Destailleur
2e81fa342e
Uniformize code, order of fiels in card and language files.
2013-04-28 01:12:40 +02:00
Laurent Destailleur
4e0ef01389
Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap
2013-04-25 01:13:13 +02:00
Laurent Destailleur
1f0adfaff5
Can remove an element from category when on category view.
2013-04-21 23:44:33 +02:00
Laurent Destailleur
ae01285fe9
Look: Replace table with div.
...
Look: Optimize for smartphone
2013-04-12 16:16:39 +02:00
Laurent Destailleur
3d8c312a30
Fix: Uniformize column size
...
Fix: Use dol_prind_address for addressees
2013-04-10 16:15:35 +02:00
Laurent Destailleur
b496436fe3
Qual: Reduce number of methods. Mutualize update_note code.
2013-04-10 10:58:38 +02:00
Laurent Destailleur
fe895adb95
Fix: Bad div
2013-03-30 19:37:09 +01:00
Laurent Destailleur
89365786a8
New: enhance tool fixdosfiles.sh
...
Convert DOS files to unix
2013-03-30 14:27:13 +01:00
Laurent Destailleur
55f9879a6c
Replace table with div. Prepare work for android application.
2013-03-16 14:53:15 +01:00
Laurent Destailleur
6bc280ea7e
Test for some terminals
2013-03-11 10:18:25 +01:00
Grand Philippe
79c2e17cbb
english language standardization
2013-02-25 17:56:41 +01:00
Grand Philippe
86de772b31
english language standardization
2013-02-24 17:08:52 +01:00
Grand Philippe
a237be0d24
english language standardization
2013-02-23 15:26:39 +01:00
Grand Philippe
a582fd3f15
english standardization
2013-02-22 16:14:52 +01:00
Laurent Destailleur
2852aded3a
New: Add button collapse/expand for menu, category and user views.
2013-02-20 21:16:31 +01:00
Laurent Destailleur
46170c0255
New: Focus on first field
2013-02-19 15:33:49 +01:00
Grand Philippe
4a4c7e9ca9
useless file
2013-02-04 08:54:04 +01:00
Regis Houssin
647cbb08fb
Fix: wrong EOL
2013-01-26 10:38:11 +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
0db303ca59
Merge remote-tracking branch 'origin/3.3' into develop
2013-01-23 23:35:39 +01:00
Laurent Destailleur
3472282703
Fix: [ bug #667 ] Customer categories wrong tree shown after update
...
3.2->3.3
2013-01-23 23:34:43 +01:00
Laurent Destailleur
d11cee399a
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
COPYRIGHT
htdocs/core/tpl/freeproductline_create.tpl.php
htdocs/core/tpl/predefinedproductline_create.tpl.php
htdocs/install/mysql/tables/llx_c_availability.sql
2013-01-16 15:45:17 +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
Laurent Destailleur
29e6d01e51
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/core/tpl/freeproductline_create.tpl.php
htdocs/core/tpl/predefinedproductline_create.tpl.php
2013-01-13 19:33:54 +01:00
Laurent Destailleur
ec8b260bf6
New: Prepare 3.4 branch
...
New: Add hook for agenda, info and category tabs
2013-01-12 14:34:16 +01:00
Regis Houssin
b838895db9
Fix: change for a neutral email
2012-12-30 15:13:49 +01:00
Regis Houssin
5740c7e694
Fix: change for a neutral email
2012-12-30 15:11:07 +01:00
Regis Houssin
8908f977b8
Fix: converting line delimiters !!!
2012-11-14 11:31:08 +01:00
Laurent Destailleur
e7164cb243
Fix: Some checkstyle errors
2012-11-11 18:18:57 +01:00
simnandez
353c932e11
Fix: if no results do not charge data
2012-11-06 12:33:35 +01:00
simnandez
425ebae802
New: More import options. Products categories
2012-10-26 18:19:04 +02:00
Regis Houssin
15aa2497ab
Fix: compatibility with multicompany sharings
2012-10-16 17:59:00 +02:00
Regis Houssin
9f43d8613c
Fix: missing clean parameters
2012-10-09 16:59:19 +02:00
Regis Houssin
8486f9d85d
Fix: missing spaces
2012-10-09 16:33:28 +02:00
Laurent Destailleur
8b4886073c
Fix: Removed the FIXME. This is supported by the pgsql driver.
2012-10-09 12:03:39 +02:00
Regis Houssin
72a1194d14
Fix: search with case sensitive method
...
FIXME: Mysql "LIKE" is case insensitive by default and use LIKE BINARY
for case sensitive, Pgsql "LIKE" is case sensitive by default, and use
ILIKE for case insensitive
2012-10-09 10:57:15 +02:00
Regis Houssin
d61a8ee947
Fix: missing comma
2012-10-09 08:47:11 +02:00
Regis Houssin
089603e1c5
Fix: add import_key field
2012-10-09 08:40:32 +02:00
Regis Houssin
7f7676d357
Fix: uniformize variable name
2012-10-08 20:44:12 +02:00
Regis Houssin
0975918cc6
Fix: [task #146 ] Remove table llx_categorie_association
...
Conflicts:
htdocs/install/mysql/migration/3.2.0-3.3.0.sql
2012-10-08 19:27:02 +02:00
Regis Houssin
43c0a03758
Fix: strict mode tornado
2012-09-15 11:21:22 +02:00
Regis Houssin
e19f8c54f1
Fix: strict mode hurricane
2012-09-15 10:01:35 +02:00
Regis Houssin
a7bfc722d5
Fix: use specific variable
2012-09-09 16:31:00 +02:00
Laurent Destailleur
2c2d17b101
Fix: Try a fix to avoid having the hover on array that should not have
...
it.
2012-09-09 13:13:24 +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
f3674317ec
Removed parenthesis from all require and replaced with single quotes
2012-08-22 23:24:21 +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
816e317dd2
Fix into categorie functions
2012-08-05 23:58:42 +02:00
Regis Houssin
a157327859
Fix: strict mode paradise
2012-07-28 11:28:37 +02:00
Laurent Destailleur
7883124958
New: [ task #454 ] Add "No category" into filters on category
2012-07-28 00:53:51 +02:00
Laurent Destailleur
a2e745fab6
Fix: Function return was missing in some case. Save bug of empty
...
category.
2012-07-27 23:21:22 +02:00
Regis Houssin
c6cd17cf3f
Fix: strict mode... far away
2012-07-24 17:52:46 +02:00
Regis Houssin
66b2f630ac
Fix: big avoid strict mode errors
2012-07-09 12:31:21 +02:00
Regis Houssin
6f1651309e
Fix: global converting lines delimiter
2012-07-02 19:30:37 +02:00
Laurent Destailleur
2a3db5a3ac
Fix: new self is not compatible with most version of PHP. Also result is
...
not predicable as it depends on PHP version.
2012-05-21 20:31:02 +02:00
Regis Houssin
5f835bed7e
Fix: broken features
2012-05-21 15:45:44 +02:00
Regis Houssin
161e39794e
Fix: security update for multicompany
2012-04-15 11:30:06 +02:00
Regis Houssin
e49df57667
Fix: compatibility with php 5.4 and E_STRICT mode
2012-04-14 15:04:46 +02:00
Regis Houssin
921c8607d7
Fix: multicompany sharings and uniformize code
2012-04-07 10:19:33 +02:00
Laurent Destailleur
c77bc5adf5
Doxygen
2012-03-31 15:42:33 +02:00
Regis Houssin
b204ad5b84
Fix: multicompany compatibility
2012-03-29 01:42:05 +08:00
Laurent Destailleur
f37e3956b8
Prepare code to allow usage of ajax in ecm module
2012-03-21 21:32:36 +01:00
Regis Houssin
33bf32073f
Fix: add more debug log
2012-03-21 11:17:52 +01:00
Regis Houssin
1aa71803ce
Fix: add begin/commit/rollback
2012-03-21 10:08:49 +01:00
Regis Houssin
2341e6c881
Fix: add log for debug phpunit error
2012-03-21 09:47:55 +01:00
Regis Houssin
b83026f883
Fix: for multicompany category sharing
2012-03-20 22:46:57 +08:00
Regis Houssin
507e9af5cb
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-03-20 14:42:53 +01:00
Regis Houssin
b7af14393c
Fix: for multicompany category sharing
2012-03-20 14:42:43 +01:00
Laurent Destailleur
845fe95128
Return specific code for duplicate
2012-03-20 13:51:50 +01:00
Regis Houssin
82cff13b66
Fix: missing type of category
2012-03-20 12:26:02 +01:00
Regis Houssin
2967c2357e
Fix: compatibility with multicompany
2012-03-20 11:59:18 +01:00
Laurent Destailleur
6550ba53f6
More phpunit test
2012-02-29 11:48:03 +01:00
Regis Houssin
27d88b34d8
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-02-28 19:18:34 +01:00
Regis Houssin
ffc492ba1f
Fix: security
2012-02-28 19:18:24 +01:00
Laurent Destailleur
1645ddbe47
Sec: Sanitize all input for ids.
2012-02-27 22:26:22 +01:00
Laurent Destailleur
c4b845d60a
Qual: Removed deprecated function name.
2012-02-19 18:34:22 +01:00
Laurent Destailleur
08e33f20dc
Qual: Uniformize code
...
Doxygen
2012-01-19 09:53:27 +01:00
Laurent Destailleur
c2348ef600
Uniformize field country_id, country_code, country
2011-12-29 18:07:41 +01:00
Laurent Destailleur
1f37dc906f
Qual: Uniformize name of barcode into "barcode".
2011-12-07 11:59:41 +01:00
Laurent Destailleur
ebea7f6c97
Fix: fix not initialized variables
2011-12-05 18:36:54 +01:00
Laurent Destailleur
b0aff1c927
Fix: fix not initialized variables
2011-12-05 17:13:48 +01:00
Regis Houssin
f0c327c070
Fix: uniform code
...
replace all $html by $form with exceptions "$htmlname, $htmltooltip"
2011-11-08 17:22:31 +08:00
Laurent Destailleur
40da2e23d2
Qual: Reduce sub-options of module fckeditor. This make code cleaner
...
and all this duplicated options were useless.
2011-11-05 23:18:49 +01: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
Regis Houssin
30c5f4b214
Move all core class in htdocs/core/class
2011-10-24 09:29:17 +02:00
Regis Houssin
2099cfebf3
Fix: uniformize code
2011-10-04 20:57:13 +08:00
eldy
8976e8e03d
Look: Uniformize label of login/id
2011-10-01 13:00:57 +02:00
Laurent Destailleur
be6286c4b8
Qual: More POO.
...
Qual: Doxygen
2011-09-20 17:19:46 +00:00
Laurent Destailleur
852a997559
Fix: Solve phpcodesniffer errors and warning
2011-09-14 22:15:04 +00:00
Laurent Destailleur
b8a377fa8f
Doxygen
2011-09-12 17:43:31 +00:00
Laurent Destailleur
b75d19c264
Qual: Uniformize constructors
2011-09-11 18:35:38 +00:00
Laurent Destailleur
ea0b2c6c2c
Fix: pgsql compatibility
2011-09-10 23:31:12 +00:00
Laurent Destailleur
889c3b3521
Fix: pgsql compatibility
2011-09-10 23:25:54 +00:00
Laurent Destailleur
56af3e9064
Fix: pgsql compatibility
2011-09-10 23:31:12 +00:00
Laurent Destailleur
cb35314287
Fix: pgsql compatibility
2011-09-10 23:25:54 +00:00
Laurent Destailleur
7402bd0ac6
Fix: pgsql compatibility
2011-09-10 23:31:12 +00:00
Laurent Destailleur
7bc39b0eaa
Fix: pgsql compatibility
2011-09-10 23:25:54 +00:00
Laurent Destailleur
65c2d93a29
Fix: When creating invoice from other object, discount are created
...
automatically
2011-09-10 17:52:21 +00:00
Laurent Destailleur
e4ff4d8e80
Fix: pgsql compatibility
2011-09-10 23:31:12 +00:00
Laurent Destailleur
a611b25704
Fix: pgsql compatibility
2011-09-10 23:25:54 +00:00
Laurent Destailleur
4d80d1af24
Doxygen
2011-08-30 07:59:26 +00:00
Laurent Destailleur
ffc85f4185
Removed warning
2011-08-30 07:56:03 +00:00
Laurent Destailleur
ff954120ec
Qual: Removed errors reported by phpcodesniffer
2011-08-29 23:02:31 +00:00
Laurent Destailleur
32801b548a
Doxygen
2011-08-29 22:52:04 +00:00
Laurent Destailleur
130dc70917
Qual: Removed errors reported by phpcodesniffer
2011-08-29 23:02:31 +00:00
Laurent Destailleur
fb05c0745d
Doxygen
2011-08-29 22:52:04 +00:00
Laurent Destailleur
f8dc9b8123
Qual: Removed errors reported by phpcodesniffer
2011-08-29 23:02:31 +00:00
Laurent Destailleur
d70f1e5e0b
Doxygen
2011-08-29 22:52:04 +00:00
Laurent Destailleur
4eb38cb202
Qual: Removed errors reported by phpcodesniffer
2011-08-29 23:02:31 +00:00
Laurent Destailleur
c0c6d1bede
Doxygen
2011-08-29 22:52:04 +00:00
Laurent Destailleur
da04be88a0
Perf: Little speed enhancement
2011-08-29 21:06:00 +00:00
Laurent Destailleur
41ada61bdd
Doxygen
2011-08-29 22:52:04 +00:00
Laurent Destailleur
511b6cf4f0
Qual: Removed errors reported by PHPCodeSniffer
2011-08-28 02:31:46 +00:00
Laurent Destailleur
33291277de
Qual: Removed errors reported by PHPCodeSniffer
2011-08-28 02:25:40 +00:00
Laurent Destailleur
482a205936
Qual: Removed errors reported by PHPCodeSniffer
2011-08-28 02:18:20 +00:00
Regis Houssin
726d9581dd
Fix: remove obsolete tags (in progress)
2011-08-27 14:24:16 +00:00
Laurent Destailleur
3c8a530bd0
Fix: Use correct label
2011-08-24 12:31:12 +00:00
Laurent Destailleur
5350a64d59
W3C
2011-08-24 12:20:06 +00:00
Laurent Destailleur
89128f7747
Add button to create category
2011-08-24 11:16:43 +00:00
Regis Houssin
d01d8021b7
Fix: missing entity
...
Fix: missing security
Fix: remove obsolete files
2011-08-20 09:02:56 +00:00
Laurent Destailleur
dcbc3c99f3
Look: Minor enhancement
2011-08-18 22:33:43 +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
f4606c2253
Fix: Avoid errors into rpm packages
2011-08-03 00:45:22 +00:00
Laurent Destailleur
40704a5c5a
Look fixes and enhancements
2011-07-20 19:03:31 +00:00
Laurent Destailleur
b6b0f8dbfb
Fix: Creation category
2011-07-04 09:54:02 +00:00
Cyrille de Lambert
aa51cfd642
possibility of having two classes with the same name in two different tree level
2011-06-28 09:25:57 +00:00
Regis Houssin
76e8107713
Fix: why no link ?
2011-03-19 17:43:05 +00:00
Regis Houssin
bcefd7006b
Fix: why no link ?
2011-03-19 12:55:01 +00:00
Regis Houssin
3843925023
Fix: uniformize code
2011-03-19 12:47:39 +00:00
Regis Houssin
9919f76de2
Works on enhancement of "ok","warning" or "error" message with jQuery jnotify
2011-03-18 16:44:55 +00:00
Regis Houssin
8e4da32226
Fix: missing trad
2011-03-14 11:21:46 +00:00
Regis Houssin
4b214210a7
Fix: add element definition
2011-03-11 17:42:39 +00:00
Regis Houssin
8bad1bfa61
Fix: uniformize code
...
New: add categories module library
2011-03-11 14:59:35 +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
Laurent Destailleur
5fbe077deb
Add option ADHERENT_LOGIN_NOT_REQUIRED
2011-03-06 13:55:47 +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
36119bb476
Fix: Missing trans
2011-02-06 23:02:04 +00:00
Regis Houssin
09f6fab2cc
New: add width parameter in editor
2011-02-02 16:56:55 +00:00
Laurent Destailleur
980ed1a7dc
New: Prefix on third party is not used by default. Hidden option SOCIETE_USEPREFIX can restore old feature.
2011-01-29 16:25:01 +00:00
Laurent Destailleur
9c389af746
Fix: bug #32006 : Catégories d'adhérents
2011-01-19 15:14:52 +00:00
Laurent Destailleur
48dbcf5425
Fix: bug #31902 : CLIENT CATEGORY SUPPRESS
2011-01-19 15:08:45 +00:00
Philippe Grand
3b1874446c
usefull to correct some display issues with bureau2crea
2010-12-29 16:26:17 +00:00
Laurent Destailleur
fb918aa001
Fix: New product status was not visible on all tabs.
2010-12-18 17:51:15 +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
Juanjo Menent
a52e5888d0
Fix: bug #31718 : External users and their access
2010-12-13 20:24:30 +00:00
Laurent Destailleur
31f442b145
Fix: Background of line
2010-11-13 17:06:34 +00:00
Regis Houssin
a2f4671380
Fix: change _REQUEST with GETPOST for _COOKIE problem
2010-11-07 22:02:35 +00:00
Laurent Destailleur
d9bc203c59
Doxygen
2010-10-27 22:41:40 +00:00
Laurent Destailleur
3d507349ce
Qual: More phpunit tests
2010-10-23 18:03:07 +00:00
Laurent Destailleur
63b3cf65ec
New: Can edit root of a category
2010-10-19 22:52:32 +00:00
Laurent Destailleur
342f7963f6
Fix: Css style of rows
2010-10-19 21:26:23 +00:00
Regis Houssin
a58ae14d8f
Fix: search company with jQuery - ok
2010-10-10 18:04:28 +00:00
Laurent Destailleur
554abc46c7
Work on task #10579 : Simplify code using editor
2010-09-02 18:51:47 +00:00
Philippe Grand
fb06c15330
task #6689 , strlen problem
...
replace strlen with dol_strlen
2010-08-24 14:42:18 +00:00
Laurent Destailleur
f149c1044f
Fix: sql error
2010-08-06 16:14:42 +00:00
Laurent Destailleur
ded13125c8
Fix: Error in creating categories
2010-07-29 13:13:41 +00:00
Laurent Destailleur
d46ed0c984
Fix: Doxygen documentation
...
Removed deprecated files
2010-07-21 11:21:37 +00:00
Laurent Destailleur
d2acbc35ec
Fix: Fix a lot of bugs (missing translations, sql error, country flag not shown, region management, W3C, ajax too slow...)
2010-07-09 23:49:41 +00:00
Juanjo Menent
416e993ad6
Trad: notifications tab.
2010-06-30 15:39:47 +00:00
Laurent Destailleur
c49cdebc08
Missing trad
2010-06-02 20:01:13 +00:00
Philippe Grand
4deb00ef2e
according to new tree directory
2010-05-03 08:43:33 +00:00
Laurent Destailleur
968addfad3
Fix: Better error management in upload files
2010-05-01 14:28:48 +00:00
Philippe Grand
16a8ab7d59
according to new tree directory
2010-04-29 14:54:12 +00:00
Philippe Grand
b65ddfabe8
according to new tree directory
2010-04-28 21:29:12 +00:00
Philippe Grand
3f4bee1f18
according to new tree directory
2010-04-28 12:53:28 +00:00
Philippe Grand
b6bc9223df
according to new tree directory
2010-04-28 10:33:16 +00:00
Philippe Grand
c73003b3b1
according to new tree directory
2010-04-27 14:48:11 +00:00
Philippe Grand
7d88487c80
according to new tree directory
2010-04-25 10:50:09 +00:00
Regis Houssin
335c038dd8
Fix: regression
2010-04-21 22:14:11 +00:00
Regis Houssin
621bd68e3b
Fix: workflow module is enabled by default
...
Fix: integration of triggers in the workflow module
!!! we now call "call_workflow" instead of "run_triggers" !!!
2010-04-21 16:29:37 +00:00
Regis Houssin
e2d2461d1f
Fix: category problem
2010-04-15 17:34:44 +00:00
Regis Houssin
73f216fd89
Fix: rename $class to $classname to prevents problems
...
http://www.manuelphp.com/php/reserved.keywords.php
2010-04-09 07:55:37 +00:00
Philippe Grand
011ea91f81
move interfaces class to core directory
2010-04-08 13:09:00 +00:00
Philippe Grand
671ce8a542
move societe class file to societe directory
2010-03-29 20:52:30 +00:00
Laurent Destailleur
a266e92bd0
New: Wrong codes are shown in red
2010-03-28 21:49:43 +00:00
Laurent Destailleur
d0f5ddb322
Fix: Postgres compatibility
2010-03-24 13:43:10 +00:00
Regis Houssin
c7df8f8807
Fix: move module class to your own directory
2010-03-22 15:31:13 +00:00
Laurent Destailleur
e89c3ba08e
New: Enhancement in category module
2010-03-20 20:24:32 +00:00
Laurent Destailleur
10f1df53e0
New: Enhancement in category module
2010-03-20 13:12:00 +00:00
Laurent Destailleur
7ba8f38348
New: Enhancement in category module
2010-03-20 00:16:31 +00:00
Laurent Destailleur
5a58b6b6ea
New: Enhancement in category module
2010-03-20 00:07:47 +00:00
Laurent Destailleur
f1216bfe4c
New: Can filter on categories for third parties list
2010-03-16 19:50:07 +00:00
Laurent Destailleur
465cc90759
Fix W3C errors in page forging
2010-03-15 23:54:37 +00:00
Laurent Destailleur
c05a1e066b
Fix: Can edit supplier
2010-03-13 22:28:03 +00:00
Laurent Destailleur
65f68c3283
Remove old fiel hidden category
2010-03-13 21:27:33 +00:00
Laurent Destailleur
0f591d36ad
Fix: Default category when editing a supplier.
2010-03-12 23:59:23 +00:00
Laurent Destailleur
a577152057
Fix: Missing translation
2010-03-12 23:52:34 +00:00
Regis Houssin
ed44821987
Qual: First change to remove pre.inc.php
2010-03-01 09:37:12 +00:00
Laurent Destailleur
20d4f65aed
Look: Use style fieldrequired on mandatory fields
2010-02-28 16:14:00 +00:00
Laurent Destailleur
ffd1e04f55
Fix: Reduce content of third parties tab
2010-02-27 20:19:55 +00:00
Regis Houssin
04cd6e919a
Fix: management of time spent in task card
2010-02-24 10:57:37 +00:00
Laurent Destailleur
ba5e5d0702
Remove duplicate code
2010-01-19 09:54:04 +00:00
Laurent Destailleur
c20be36714
New: A customer can also be a prospect.
2010-01-05 20:03:37 +00:00
Regis Houssin
3b5735bd9c
Fix: uniformize code
...
Fix: if the contact's address is empty, it uses one of the company
2009-12-23 10:07:48 +00:00
Regis Houssin
4c601248d4
Fix: doxyfile
...
Add: category triggers (patch of Jean-Francois Ferry)
2009-12-17 10:26:39 +00:00
Regis Houssin
1e34322435
Fix: bad security request
2009-11-28 12:06:11 +00:00
Regis Houssin
d6e0912f6c
Fix: bad security access
...
Fix: add entity in facture_rec and constraint with fk_soc
Fix: uniformize code
2009-11-19 11:25:08 +00:00
Laurent Destailleur
1a47e38b11
Fix: Bad link to category
...
Missing picto for categories
2009-11-04 19:13:37 +00:00
Regis Houssin
81464c0cf5
Fix: useing "preg_quote" is more simpler
2009-10-23 15:26:45 +00:00
Regis Houssin
37c2825f93
Fix: functions "ereg", "ereg_replace", "eregi", "eregi_replace" is deprecated since php 5.3.0
2009-10-22 15:09:04 +00:00
Regis Houssin
8b452fefa8
Fix: functions "ereg", "ereg_replace", "eregi", "eregi_replace" is deprecated since php 5.3.0
2009-10-21 09:42:47 +00:00
Regis Houssin
8090f62623
Fix: functions "ereg", "ereg_replace", "eregi", "eregi_replace" is deprecated since php 5.3.0
2009-10-20 19:31:06 +00:00
Regis Houssin
01291c4a7c
Fix: function "split" is deprecated since php 5.3.0
2009-10-20 13:14:44 +00:00
Regis Houssin
2303de3162
Fix: just one & its ok :)
2009-10-16 13:15:26 +00:00
Regis Houssin
2d6444fb68
Security: More features to check
2009-10-16 13:09:56 +00:00
Laurent Destailleur
f68be991ff
Fix: Data in memory must always be encoded in utf8. PHP files functions need ISO, so we convert data just before and after using them.
2009-10-04 17:18:09 +00:00
Laurent Destailleur
8371684535
Fix: Error management in categories creation
2009-08-28 16:37:45 +00:00
Laurent Destailleur
0b12c2de44
Fix: Error management in categories creation
2009-08-28 16:37:45 +00:00
Laurent Destailleur
5f173e01ee
Qual: Ajax code is simpler and now works with IE6
2009-08-28 01:14:35 +00:00
Laurent Destailleur
8761c985b7
New: Add picto on tab titles
2009-08-06 13:21:23 +00:00
Laurent Destailleur
0baf06d2d1
New: Add picto on tab titles
2009-08-05 17:19:55 +00:00
Laurent Destailleur
0b31e61313
Qual: Uniformize code
2009-07-29 23:45:33 +00:00
Regis Houssin
c9affcb8a2
Fix: category type is missing after add or delete photo
2009-07-22 20:06:45 +00:00
Laurent Destailleur
30a41b5437
Add patch from meos to add photos on categories.
...
Fix: Solve pb in categories navigation
2009-07-22 17:28:56 +00:00
Laurent Destailleur
8906d988ed
Add patch from meos to add photos on categories.
...
Fix: Solve pb in categories navigation
2009-07-22 17:02:49 +00:00
Laurent Destailleur
8732364f01
Qual: Now module services and products are two completely separated modules.
2009-06-08 18:14:37 +00:00
Laurent Destailleur
47d77ba51b
Fix: Try to fix expand pb
2009-05-22 15:06:17 +00:00