Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-07 18:18:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
41,866 Commits 36 Branches 190 Tags
4b9d1b901bccd39b6cd8967ae13b84f8221b0e00
Commit Graph

129 Commits

Author SHA1 Message Date
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
d256799abf Work on adding catgory translation 2014-04-25 15:17:12 +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
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
55750e16d8 Prepare extrafields into categories 2014-03-16 14:48:46 +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
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
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
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
e07eac9b17 [ task #519 ] Add category association with contacts 2013-07-16 21:04:58 +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
2e81fa342e Uniformize code, order of fiels in card and language files. 2013-04-28 01:12:40 +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
b496436fe3 Qual: Reduce number of methods. Mutualize update_note code. 2013-04-10 10:58:38 +02:00
Regis Houssin
647cbb08fb Fix: wrong EOL 2013-01-26 10:38:11 +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
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
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
9f43d8613c Fix: missing clean parameters 2012-10-09 16:59:19 +02:00