lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
65,051 Commits 43 Branches 150 Tags 886 MiB
94140b04ca
Commit Graph

118 Commits

Author SHA1 Message Date
Laurent Destailleur
26ba0a9ec2 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/cashdesk/index.php
	htdocs/compta/index.php
	htdocs/core/lib/security.lib.php
	htdocs/societe/list.php
 2018-01-16 20:23:32 +01:00
Juanjo Menent
762ab74940 FIX: Cashdesk should not sell to inactive third parties 2018-01-04 18:09:25 +01:00
Laurent Destailleur
eab44f62b1 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_builddoc.inc.php
	htdocs/core/class/html.form.class.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
	htdocs/core/tpl/admin_extrafields_edit.tpl.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/core/tpl/notes.tpl.php
	htdocs/main.inc.php
	htdocs/product/inventory/tpl/inventory.tpl.php
	htdocs/societe/tpl/linesalesrepresentative.tpl.php
 2017-12-21 14:35:33 +01:00
Laurent Destailleur
4a5988accb FIX security vulnerability reported by ADLab of Venustech 2017-12-21 12:52:19 +01:00
Laurent Destailleur
58b08c7de8 Clean code 2017-09-01 23:56:59 +02:00
Quentin Sutkowski
c761eb592e Fix barcode reader on POS 
Solve the keyboard emulation issue with a barcode reader on cashdesk module research area.
 2017-08-31 11:15:55 +02:00
Laurent Destailleur
a88bafe198 Fix responsive 2017-06-13 20:07:28 +02:00
Laurent Destailleur
fc5dfcda65 Fix error management in POS. 2017-06-13 19:46:27 +02:00
Laurent Destailleur
ba3a74576c Merge 5.0 2017-06-12 18:22:51 +02:00
Laurent Destailleur
9341d5f448 FIX Line of invoices not inserted when using POS module and VAT NPR. 2017-06-09 15:35:27 +02:00
Laurent Destailleur
b8b91db007 Use function top_httphead to include headers in pages. 2017-05-09 21:46:57 +02:00
Laurent Destailleur
979bcd3a9b NEW Can add a background image on login page 2017-03-31 11:40:31 +02:00
Laurent Destailleur
b9a9997688 Page societe/soc.php and compta/facture.php was renamed into card.php 
to match page naming conventions.
 2017-03-20 21:29:22 +01:00
Gustavo Novaro
8d00297509 Move php values to js call 
Not inside js declaration
 2017-02-08 16:11:31 -03:00
Laurent Destailleur
b1e5d8ce98 FIX Combo list of VAT is wrong on POS 2017-01-24 14:33:49 +01:00
Laurent Destailleur
f591e2b1b1 FIX Combo list of VAT is wrong on POS 2017-01-24 14:29:05 +01:00
Laurent Destailleur
49fc8129ac NEW Can change customer from POS 2017-01-18 01:37:12 +01:00
Laurent Destailleur
b28ba7a5ff Merge pull request #6252 from gnovaro/develop 
Improve cashdesk code style. Ticket now have ticket.css file
 2017-01-12 11:31:51 +01:00
Laurent Destailleur
8ab0ad3b72 Fix css 2017-01-09 10:36:24 +01:00
Laurent Destailleur
03aa8343fd Fix css 2017-01-09 10:21:35 +01:00
Gustavo Novaro
2248429eda Improve cashdesk code style. Ticket now have ticket.css file 2017-01-08 04:57:47 -03:00
Laurent Destailleur
60b8582aa9 Fix more then 30 security defects 2016-12-18 01:44:26 +01:00
Laurent Destailleur
efde12b489 Fix minor css 2016-09-09 09:21:27 +02:00
Laurent Destailleur
8cfac3b5c3 FIX Several problems when using smartphone 2016-08-31 12:38:54 +02:00
Laurent Destailleur
7935967c62 Fix duplicate translation key 2016-05-21 12:30:58 +02:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Marcos García de La Fuente
89bd173c2f NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate 2016-03-21 21:51:29 +01:00
Marcos García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Laurent Destailleur
af3256f84a Fix first change to fix serious pb with vat definition when using the 
POS.
 2016-03-19 21:35:03 +01:00
Laurent Destailleur
3eb8d3105a NEW Better look for POS. More responsive design. 2015-09-18 14:11:50 +02:00
Laurent Destailleur
1fb40565f4 Fix bad parameters of function select_date 2015-07-12 12:50:24 +02:00
Laurent Destailleur
87e07a3038 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
	htdocs/compta/bank/virement.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/product/card.php
	htdocs/societe/soc.php
 2015-06-14 17:18:45 +02:00
Laurent Destailleur
b42f9a6706 Fix phpcs 2015-06-14 15:16:29 +02:00
Regis Houssin
f5168625d8 Fix: broken feature: barcode search #3019 2015-06-13 10:43:55 +02:00
Raphaël Doursenaud
5d2f081152 [Qual] Fixed HTML select form selected attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The select form selected attribute should not have a value.
 2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
b8d9c20731 [Qual] Fixed HTML input form disabled attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form disabled attribute should not have a value.
 2015-05-07 14:21:14 +02: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
fc78d632d3 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/main.inc.php
 2015-01-09 23:09:10 +01:00
Drosis Nikos
68049a2f0e Fix Lang for Check Payment Type 2015-01-02 18:10:47 +02:00
Laurent Destailleur
01209ff844 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/product/stock/card.php
 2014-11-30 14:15:38 +01:00
Laurent Destailleur
7303983610 Fixed: Ton of old bugs when debugging POS. 2014-11-30 01:35:58 +01:00
Laurent Destailleur
7f0a01936e Fix a very old bug of conflicth into decrease stock when using point of 
sale, not compatible with option defined into stock module.
 2014-11-28 20:41:52 +01:00
aspangaro
c4c69e191b Replace <center> tags 2014-11-25 20:13:43 +01:00
Laurent Destailleur
dd20d04002 Fix: Must use active tag of vat, not county table. 2014-10-27 12:59:19 +01:00
Laurent Destailleur
bc1279ccfa Brighter button. We use CSS and no more image. 2014-10-03 11:27:12 +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
ad4babb154 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	.travis.yml
	htdocs/fichinter/fiche.php
 2014-07-08 01:12:55 +02:00
BENKE Charles
e30fd28b02 Update facturation1.tpl.php 2014-06-08 14:39:04 +02:00
Laurent Destailleur
0b0c9326b9 Fix: Missing form init 2014-05-11 18:55:18 +02:00