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

200 Commits

Author SHA1 Message Date
Ion Agorria
5f9b1fa029 Changes for applying new paths 2015-03-14 16:50:02 +01:00
Laurent Destailleur
9c087e27d0 Fix permissions 2015-02-02 13:45:55 +01:00
Laurent Destailleur
d66d4f53a5 Merge branch 'tooltip' of https://github.com/frederic34/dolibarr into 
frederic34-tooltip

Conflicts:
	htdocs/core/boxes/box_produits.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/product/index.php
 2015-01-31 15:41:33 +01:00
Laurent Destailleur
1c7feb67ea Merge branch 'dinamic-prices-product' of 
https://github.com/IonAgorria/dolibarr into
IonAgorria-dinamic-prices-product

Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/fournisseurs.php
 2015-01-31 14:53:14 +01:00
frederic34
736bee565c Tooltip everywhere 2015-01-30 16:40:33 +01:00
frederic34
73fda2cb86 WIP PSR2 2015-01-08 18:36:03 +01:00
Ion Agorria
5bbcb58b44 Added expressions for product/service prices 2014-12-28 01:26:41 +01:00
Laurent Destailleur
e3a8041b0d Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/facture.php
	htdocs/user/fiche.php
 2014-11-16 15:46:08 +01:00
Laurent Destailleur
92cdef71e8 Fix: Graph report rubbish information. Better to have them as option. 2014-11-08 14:58:43 +01:00
Laurent Destailleur
7a68d9a940 Miscellaneous fixes 2014-10-16 20:55:13 +02:00
Regis Houssin
4248c7bed2 Fix: strict mode paradise 2014-10-02 09:30:31 +02:00
aspangaro
b22aef3521 Qual: Renamed all files & links "liste.php" into "list.php" 2014-09-18 20:33:37 +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
Raphaël Doursenaud
f6848e8655 Add label on search boxes 2014-07-11 13:26:02 +02:00
Laurent Destailleur
93393db991 Merge pull request #1539 from defrance69/patch-7 
Update index.php
 2014-05-04 19:15:21 +02:00
BENKE Charles
cefc62b20f Update index.php 2014-05-04 18:42:58 +02:00
BENKE Charles
b12e87abc3 Update index.php 
add the categories pie graph on product too (and correct some bug)
 2014-05-04 18:42:00 +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
1b02cdd352 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	dev/initdata/mysqldump_dolibarr_3.5.0.sql
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/product/index.php
	htdocs/user/fiche.php
 2014-04-12 00:53:25 +02:00
Grand Philippe
9a056ab497 anglicizing 2014-04-08 14:05:10 +02:00
Laurent Destailleur
6c536d43e5 Can also sort on username. Uniformize code of index page. 2014-03-05 11:37:32 +01:00
Laurent Destailleur
0b83f1a670 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-03-01 15:06:25 +01:00
Laurent Destailleur
6f4de6e6d0 Fix: [ bug #520 ] Product statistics and detailed lists are wrong 2014-03-01 15:05:00 +01:00
Laurent Destailleur
e12d31766a Fix: Hide a report at wrong place and add a comment to explain where to 
put it and to fix the calculation method.
 2013-10-10 17:34:26 +02:00
Grand Philippe
222eb18bb9 fix : 
Fatal error: Call to undefined function dol_time_plus_duree()
 2013-09-03 17:37:22 +02:00
BENKE Charles
12479a946a Update index.php 
Error on column titles
 2013-08-07 07:28:37 +02:00
BENKE Charles
54d2f1161d Update index.php 
change datep
 2013-08-07 07:15:09 +02:00
BENKE Charles
024ba2ee42 Update index.php 
Add quarter report of sell service/product
 2013-08-06 21:31:32 +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
f52fe71018 Fix: Bad div closing 2013-03-30 19:40:52 +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
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
e19f8c54f1 Fix: strict mode hurricane 2012-09-15 10:01:35 +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 GarciÌa
f3674317ec Removed parenthesis from all require and replaced with single quotes 2012-08-22 23:24:21 +02:00
Marcos GarciÌa
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Marcos GarciÌa
a6c8838b8f Applied patches 9-15 2012-07-27 21:27:03 +02:00
Regis Houssin
887f210618 Fix: avoid warning with php 5.4 and strict mode 2012-07-08 23:22:22 +02:00
Laurent Destailleur
4cc13064db Fix: W3C 2012-04-05 21:15:09 +02:00
defrance69
8cfed3ff3f Update htdocs/product/index.php 2012-04-05 14:01:15 +03:00
Regis Houssin
cd3452d71d Fix: multicompany sharings and uniformize code 2012-02-11 10:18:09 +01:00
Regis Houssin
9339119455 New: use getEntity() instead $conf->entity 2012-01-11 21:16:10 +08:00
Regis Houssin
551e1f81bf Fix: Space after closing parenthesis of function call prohibited 2011-09-20 13:32:16 +00:00
Regis Houssin
27300fe898 Fix: remove obsolete tags (in progress) 2011-08-27 16:15:06 +00:00
Regis Houssin
726d9581dd Fix: remove obsolete tags (in progress) 2011-08-27 14:24:16 +00:00
Laurent Destailleur
37ead2f97e Fix: Avoid errors into rpm packages 2011-07-31 23:19:04 +00:00
Laurent Destailleur
bc25b7bd2c Qual: Removed deprecated feature 2011-06-08 12:48:05 +00:00
Regis Houssin
bb209e3c34 New: works on sharings between entities 
Fix: more simple, more flexible, add in global conf
 2011-04-18 10:49:39 +00:00
Regis Houssin
cd420e0029 New: works on sharings between entities 
Fix: index or list just verify rights access
 2011-04-18 09:39:49 +00:00
Regis Houssin
783c050df0 New: works on sharings between entities 
Fix: problem with tosell and tobuy
 2011-04-18 08:38:51 +00:00
Regis Houssin
39e8ff606e Fix: bad position of title 2010-09-10 12:05:26 +00:00
Laurent Destailleur
a881307f01 Fix: bug #30629 : Ajout de prix fournisseur avec quantité fractionné donne erreur 2010-08-28 23:54:46 +00:00
Laurent Destailleur
218dc16ed1 Add status (tosell/tobuy) on stock list 2010-08-19 21:12:56 +00:00
Laurent Destailleur
5affcd3b3f Qual: Renamed french field "envente" into "tosell". 2010-08-11 18:35:31 +00:00
Laurent Destailleur
3ff226575e Removed deprecated code 2010-08-09 15:21:22 +00:00
Regis Houssin
8e57affa6e Fix: move llx_product_subproduct to composition module 2010-08-06 12:18:44 +00:00
Laurent Destailleur
359038d2e5 Fix: Move table in wrong repository 2010-07-10 23:13:28 +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
Regis Houssin
635b44b906 Fix: if you rename a module, rename all 2010-05-10 04:50:39 +00:00
Laurent Destailleur
9db9f23d71 Restore lang files into global lang directory. Usage of lang into modules directory must be used only for external modules to be self-dependent but must be kept for dolibarr core feature into unique htdocs/langs directory as this make working on translation a big headache and break a lot of automated translation tools. 2010-05-02 17:05:07 +00:00
Regis Houssin
fa73ddf93c Works on product canvas and templates 
!! WARNING : not stable !!

Fix: bad translation
 2010-05-02 04:57:15 +00:00
Philippe Grand
9e887c8980 according to new tree directory 2010-05-01 14:19:21 +00:00
Philippe Grand
b65ddfabe8 according to new tree directory 2010-04-28 21:29:12 +00:00
Regis Houssin
c7df8f8807 Fix: move module class to your own directory 2010-03-22 15:31:13 +00:00
Laurent Destailleur
1129856241 Fix: Trad 2010-03-21 20:11:10 +00:00
Laurent Destailleur
46a5d637aa Fix: Error in total 2010-03-17 01:46:18 +00:00
Laurent Destailleur
c8179af08b Qual: Move droitpret module into secondary repository 2010-03-16 18:26:38 +00:00
Laurent Destailleur
3cb4335f9a Move permission "see hidden categories" into "see hidden products/services". 2010-03-13 21:53:44 +00:00
Laurent Destailleur
8980d9acc2 Move permission "see hidden categories" into "see hidden products/services". 2010-03-12 23:40:39 +00:00
Laurent Destailleur
16214e7e30 Work on generic odt generation 2010-02-28 18:37:29 +00:00
Laurent Destailleur
3d8dc0b7e7 Sec: Fix security permission check 2010-02-27 17:30:17 +00:00
Regis Houssin
65fdbc3696 Works on products variants 
Fix: uniformize table name, prepare to move fields "label, description and note" in llx_product_lang
 2010-02-18 09:04:55 +00:00
Regis Houssin
818394b154 Fix: uniformize code 2010-01-05 19:07:11 +00:00
Regis Houssin
9e1100ece3 Fix: uniformize code 2010-01-05 14:10:28 +00:00
Laurent Destailleur
78643ec12a Qual: Better compatibility with other databases 2009-10-28 17:37:40 +00:00
Laurent Destailleur
3d09d88543 New: Link to wiki help 2009-08-24 12:21:46 +00:00
Laurent Destailleur
28e95b5fbd Add help link to online wiki 2009-08-12 13:07: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
Regis Houssin
e5d222b6cc Fix: régression sur l'utilisation des niveau du jeton, on test sur les 2 niveaux car 
comportement aléatoire avec certaines fonctions
 2009-05-17 08:01:54 +00:00
Regis Houssin
c1c1f8a4d2 Fix: ajout d'un niveau supplémentaire du cache du jeton 2009-05-16 15:45:26 +00:00
Regis Houssin
e63c142ce7 Fix: ajout d'un jeton aléatoire dans les requetes POST 2009-05-15 15:33:33 +00:00
Regis Houssin
b86684805c New: early development of multi-company module 2009-04-27 20:37:50 +00:00
Laurent Destailleur
cdc6493ba5 Removed TODO and deprecated files 2009-03-09 21:59:29 +00:00
Laurent Destailleur
0823322ba1 Qual: All call to dolibarr_ functions are made on dol_ functions. 2009-02-20 22:53:15 +00:00
Laurent Destailleur
0befb92a12 Removed PHP warnings with E_ALL level 2009-01-21 14:09:42 +00:00
Laurent Destailleur
bbbb8b983d Add total in statistics 2008-09-10 23:28:23 +00:00
Laurent Destailleur
94c6dc3218 Fix: More html compliant 2008-06-19 08:50:59 +00:00
Laurent Destailleur
8c4faadcb1 Fix: Create and updtae line of contract 2008-04-06 19:34:55 +00:00
Laurent Destailleur
cffe74f4b8 Doc: Doxygen 2008-02-18 23:19:55 +00:00
Laurent Destailleur
d7d4904cff Qual: Réorganisation un peu plus logique de certaines fonctions. Réduction de la taille du fichier html.form.class.php qui est chargé a chaque fois et qui consomme a lui seul 1Mo 2008-01-10 17:12:07 +00:00
Regis Houssin
073830eb6b Fix: différenciation des produits et services 2007-12-05 12:08:53 +00:00
Regis Houssin
e9c01bcfd7 modification de mon adresse mail 2007-11-01 20:39:36 +00:00
Laurent Destailleur
18e989b311 Fix: Controle sécurité user externes sur accès fichier par wrapper 
Qual: Utilisation de isproduct() et isservice()  au lieu des tests sur le type
 2007-01-31 17:52:54 +00:00
Regis Houssin
f1e83d2f4f Modifications proposées par Franky 2007-01-27 14:36:20 +00:00
Laurent Destailleur
8b9e47b346 Fix: Stats produit toujours a 0 2006-12-23 14:53:06 +00:00
Regis Houssin
840a3d24da Bugfix: message d'erreur si l'utilisateur n'avait pas le droit de voir les catégories cachées 2006-12-19 19:35:50 +00:00