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

264 Commits

Author SHA1 Message Date
Laurent Destailleur
6de732d7f8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/facture/mod_facture_mars.php
	htdocs/core/modules/facture/mod_facture_terre.php
 2019-02-01 16:07:18 +01:00
Laurent Destailleur
35f65a571c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/modules/facture/mod_facture_mars.php
	htdocs/core/modules/facture/mod_facture_terre.php
	htdocs/fourn/commande/list.php
 2019-02-01 16:05:43 +01:00
Pierre Ardoin
2d6f5ca8ab
#Fix : Error in Total Products/Services 
Its correct an error in the total of stat Products/Services total.
 2019-01-31 20:22:56 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
Laurent Destailleur
408609e0ec Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/tpl/objectline_edit.tpl.php
 2019-01-30 16:54:38 +01:00
Laurent Destailleur
9fdba921b4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
 2019-01-30 16:48:33 +01:00
Pierre Ardoin
99892c13b0
FIX : Erreur dans le Total 
Corrige l'erreur de calcul dans le total des produits et services
 2019-01-29 23:26:08 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
f30a3d59ba
Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
Frédéric FRANCE
496fa9b0fb
PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
atm-quentin
c18f486179 set facture to invoice AND check invoicenumber conf 2018-11-16 11:20:03 +01:00
atm-quentin
a8ab666d62 remplacement en masse des $conf->entity par des getEntity('facture') 2018-11-16 11:17:18 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Philippe GRAND
57f51fda3e Standardize 2018-08-15 12:48:13 +02:00
Philippe GRAND
a952b46d8b clean and update code 2018-06-27 12:37:31 +02:00
Laurent Destailleur
eb88f1e5c9 Fix look and feel v8 2018-06-23 12:41:03 +02:00
Frédéric FRANCE
d986909109
loadlangs 2018-05-26 23:52:52 +02:00
Laurent Destailleur
69adf73f4f Clean code from $var = True 2018-04-22 19:27:37 +02:00
All3kcis
1c0fdcda7a
Add status batch for getNomUrl 2018-03-16 13:57:02 +01:00
Laurent Destailleur
9c22b5f335 Replace deprecated dol_print_graph with DolGraph 2017-11-23 20:24:05 +01:00
Laurent Destailleur
abd5251330 Better responsive 2017-10-19 19:53:29 +02:00
Laurent Destailleur
ba3a74576c Merge 5.0 2017-06-12 18:22:51 +02:00
Laurent Destailleur
8f7371cdf0 Product has 2 status. Add span to differentiate for css 2017-06-12 12:24:42 +02:00
Laurent Destailleur
1af74b4c42 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/skeletons/skeleton_list.php
	htdocs/admin/perms.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/files.lib.php
	htdocs/product/class/product.class.php
	htdocs/product/class/service.class.php
	htdocs/product/index.php
	htdocs/product/list.php
	htdocs/public/members/new.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
 2017-06-09 12:50:56 +02:00
Laurent Destailleur
b92980c6ff Fix statistics on products 2017-06-09 10:38:06 +02:00
Laurent Destailleur
bec6ad9fb3 Fix bad position of hook 2017-06-09 10:22:07 +02:00
Laurent Destailleur
d6ba16d357 Fix missing printFieldListWhere hook 2017-06-09 09:45:22 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Laurent Destailleur
846204bdb4 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 13:02:29 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
Laurent Destailleur
ea44e14b60 Start debug the variant module 2017-04-07 11:01:12 +02:00
Laurent Destailleur
184d52525a PHP code to manage pair/impair is replaced by native CSS. 2017-03-07 22:45:22 +01:00
Laurent Destailleur
19e60f03b9 Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms 2017-02-21 14:17:44 +01:00
Laurent Destailleur
8fd082cf16 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/hrm/hrm.php
 2016-08-31 16:16:19 +02:00
Laurent Destailleur
8cfac3b5c3 FIX Several problems when using smartphone 2016-08-31 12:38:54 +02:00
Laurent Destailleur
57cbda416b Minor fix on stock 2016-08-08 20:41:49 +02:00
Laurent Destailleur
629271cf85 FIX Bad position of parameters on llxHeader (so online help not visible) 2016-07-28 12:23:07 +02:00
Laurent Destailleur
01417b89c3 FIX Bad position of parameters on llxHeader (so online help not visible) 2016-07-28 12:17:00 +02:00
Laurent Destailleur
af09528738 NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and 
__AMOUNT_WO_TAX__ into emails templates.
 2016-07-21 20:45:30 +02:00
Laurent Destailleur
774e327831 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/comm/remx.php
	htdocs/compta/facture.php
	htdocs/langs/en_US/companies.lang
 2016-07-21 10:30:51 +02:00
Laurent Destailleur
972d998f7e Merge remote-tracking branch 'origin/3.8' into 3.9 2016-07-21 10:25:03 +02:00
Regis Houssin
4503659cba Fix: wrong multicompany filter 2016-07-06 16:50:10 +02:00
BENKE Charlie
f40a974812 Job Done 2016-06-17 07:54:35 +02:00
BENKE Charlie
db0cf5f03f remplace level feacture by hidden function 2016-06-09 18:48:36 +02:00
Laurent Destailleur
619ebf9a3e Enhance css of search fields 2016-03-13 20:38:16 +01:00
Ion Agorria
99efbd3464 Check if dynamic price is enabled 2016-02-14 16:09:47 +01:00
Laurent Destailleur
52cd5d505e Fix several bugs on css, translation or look 2016-01-01 23:44:23 +01:00
Laurent Destailleur
c15c0f6fbb Minor css fix 2015-11-21 15:31:27 +01:00
Laurent Destailleur
7fd6d8839a Uniformize code and use a new generic search architecture 2015-10-17 01:40:46 +02:00
Laurent Destailleur
d1d6c72d7d NEW Uniformize way of working for search filters. One filter per object. 2015-10-16 22:21:26 +02:00
Laurent Destailleur
b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
 2015-10-16 10:12:36 +02:00
Laurent Destailleur
8a02c8288b Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/product/index.php
 2015-10-16 09:56:55 +02:00
Laurent Destailleur
9b85a70013 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
 2015-10-16 09:52:38 +02:00
Laurent Destailleur
3f8e9bd181 Remove warning 2015-10-10 19:24:31 +02:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
aspangaro
f3c3bb708f Move <br> 2015-07-16 05:06:46 +02:00
jfefe
f5db4d5bb7 Fix: missing getEntity function 2015-04-19 03:05:37 +02:00
jfefe
25812f0071 Add picto for commercial pages titles 2015-04-18 23:17:44 +02:00
jfefe
3825b89ead Change companies and product title picto 2015-04-18 23:13:48 +02:00
Laurent Destailleur
8ebad7a395 A serious rewrite of a lot of code to have the module batch number 
stable.
 2015-04-12 17:08:14 +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
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