Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
47,690 Commits 36 Branches 189 Tags
05a7ab158b51a05dbb38ac7b02abf0d2c1df9891
Commit Graph

262 Commits

Author SHA1 Message Date
Raphaël Doursenaud
becc240b92 Include Categories class whenever Categorie::TYPE is used 2015-05-23 23:35:49 +02:00
Raphaël Doursenaud
ee808cdfd7 Added types constants to categories 2015-05-23 18:52:31 +02:00
jfefe
f5db4d5bb7 Fix: missing getEntity function 2015-04-19 03:05:37 +02:00
Marcos García de La Fuente
dc790ff586 NEW: Feature request: A page to merge two thirdparties into one #2613 2015-04-18 20:41:09 +02:00
Laurent Destailleur
56a14da5d4 FIXME that are not bug are replaced with TODO 
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
 2015-04-12 04:01:28 +02:00
Laurent Destailleur
c931576e0e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-07 02:45:43 +02:00
Laurent Destailleur
1d6a8a46f1 To clean an int we must use (int) and not trim() 2015-04-07 02:44:30 +02:00
frederic34
19b55cb4c1 Add public note to members 2015-04-06 18:58:36 +02:00
aspangaro
d897139f25 Module member: move field note in note_private 2015-04-03 06:54:08 +02:00
Laurent Destailleur
4fffeb3a89 Clean code 2015-03-17 10:52:27 +01:00
aspangaro
d69f066735 QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01:00
Laurent Destailleur
209f8946d0 All files must be lowercase 2015-03-10 14:17:58 +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
fa55c60c35 Renamed WorkBoardResponse to WorkboardResponse 2015-02-16 23:52:49 +01:00
Marcos García de La Fuente
d5fd20e911 Renamed BoardResponse to WorkBoardResponse 2015-02-15 15:10:51 +01:00
Marcos García de La Fuente
bab0163c44 Missing Copyright info 2015-02-15 15:07:24 +01:00
Marcos García de La Fuente
d1f73499e9 Refactored dashboard indicator 2015-02-15 15:01:28 +01:00
Marcos García de La Fuente
157a6e109e Misc Adherents PHPDoc corrections 2015-02-10 10:45:48 +01:00
frederic34
3206957b99 Tooltip 2015-02-01 20:58:57 +01:00
frederic34
e18577aa62 Tooltip and lib for file cache 2015-01-24 21:46:05 +01:00
Laurent Destailleur
6bda61436b Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	dev/codesniffer/ruleset.xml
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/functions2.lib.php
	htdocs/projet/element.php
 2015-01-22 21:52:55 +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
Marcos García de La Fuente
0b18ce5fc4 PHPDoc + missing return statements 2015-01-18 16:16:46 +01:00
frederic34
60661ae948 Add some "classfortooltip" 2015-01-09 00:07:54 +01:00
Laurent Destailleur
8996953077 Fix: error reported by scrutinizer 2014-12-20 15:42:03 +01:00
Laurent Destailleur
c36d362248 Fix: PHPCS 2.0 2014-12-05 17:38:34 +01:00
Laurent Destailleur
253fd83aca Fixed: When invoice is created from subscription, the accountancy code 
was wrong because product added was a free product using default value
for accountancy code. Fix is to choose product into member module
page.
 2014-12-01 13:26:05 +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
5e0946bdc2 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/adherents/fiche.php
	htdocs/core/lib/date.lib.php
	htdocs/langs/fr_FR/bills.lang
	htdocs/resource/class/resource.class.php
 2014-11-05 16:37:07 +01:00
aspangaro
1405c03f7d Fix: Civility & birthdate wasn't save into adherent module 2014-10-26 06:48:08 +01:00
Laurent Destailleur
97eec37f1c Uniformize code: property "nom" for thirdparty is aliased into "name" 
everywhere.
 2014-10-04 17:20:17 +02:00
Xebax
add55e480e Fix bug #1610: Civility is not displayed. 2014-10-01 22:00:45 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
Laurent Destailleur
83447243ae Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	build/debian/get-orig-source.sh
	htdocs/product/class/product.class.php
	htdocs/societe/soc.php
 2014-09-15 22:58:39 +02:00
Laurent Destailleur
f264e25514 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/adherents/liste.php
	htdocs/compta/bank/bankid_fr.php
	htdocs/holiday/index.php
	htdocs/opensurvey/list.php
 2014-09-13 19:10:05 +02:00
Laurent Destailleur
8dd9358214 Fix: SQL injection 2014-09-13 19:04:25 +02:00
aspangaro
f774ff487b Merge branch 'Upstream/develop' 2014-08-18 11:56:49 +02:00
aspangaro
1a87d98357 Qual: Renamed table llx_c_civilite into llx_c_civility 
field civilite into label in the same table and field civilite into civility in other table
 2014-08-12 06:03:27 +02:00
aspangaro
48006cb42d Correct 2014-08-11 13:27:27 +02:00
aspangaro
0738103da8 Renamed llx_c_pays to llx_c_country & field "libelle" to "label" 2014-08-10 13:37:39 +02:00
Laurent Destailleur
bb8ec0c8f9 Fix: Too many parameter 2014-08-01 14:26:13 +02:00
Laurent Destailleur
5572364d2b Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	dev/codesniffer/ruleset.xml
 2014-07-20 16:09:42 +02:00
Laurent Destailleur
8d46b02d67 Fix: missing property 2014-07-20 15:58:05 +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
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
685b7b23ad FIX: Member's trigger problem 2014-07-03 15:09:46 +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
Laurent Destailleur
3791175536 Fix: doxygen 2014-06-20 13:07:15 +02:00
Marcos García de La Fuente
56abf1cd72 Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00