Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-03 15:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
54,329 Commits 37 Branches 191 Tags
9b1caefbf9c68ba433333efbeb125cb15d4b10dd
Commit Graph

374 Commits

Author SHA1 Message Date
aspangaro
c4c69e191b Replace <center> tags 2014-11-25 20:13:43 +01:00
Laurent Destailleur
31d8f792e5 Better responsive design POS 2014-10-27 13:21:33 +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
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
Laurent Destailleur
f64cb085a7 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-08-30 18:27:34 +02:00
Laurent Destailleur
d485e270b9 Fix: menu param is not inside allowed list 2014-08-21 23:19:01 +02:00
aspangaro
0738103da8 Renamed llx_c_pays to llx_c_country & field "libelle" to "label" 2014-08-10 13:37:39 +02:00
Marcos García de La Fuente
4f4ac30fc0 Deprecating arbitrary use of dol_htmloutput* functions 2014-07-20 02:32:13 +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
Laurent Destailleur
90a5f6c7ef Qual: Remove end php tag. 2014-07-08 01:02:30 +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
722847cbe6 Add option to enable keypad (in most cases, we don't need this). 2014-06-26 21:57:49 +02:00
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
BENKE Charles
e30fd28b02 Update facturation1.tpl.php 2014-06-08 14:39:04 +02:00
BENKE Charles
32a1086ff7 Update affIndex.php 2014-06-08 14:36:31 +02:00
BENKE Charles
2503a69f98 Create keypad.js 2014-06-08 14:35:53 +02:00
BENKE Charles
174b4ee6a2 add dynamic keypad on cashdesk 2014-06-08 14:35:07 +02:00
Laurent Destailleur
1f8c35b70b Fix: security 2014-05-28 19:38:30 +02:00
Raphaël Doursenaud
c48c3a9d91 Qual: remove PHP closing tag (again) 
These were reintroduced by careless merge
 2014-05-26 13:51:25 +02:00
Laurent Destailleur
0b0c9326b9 Fix: Missing form init 2014-05-11 18:55:18 +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
b56f59b313 Perf: Avoid to isntantiate object 'form' into 'subform' classes when 
already available.
Qual: Better information into xdebug page.
 2014-05-01 16:26:57 +02:00
Marcos García de La Fuente
ad928cb443 Replacing invoice integer types with Facture constants 2014-02-26 00:56:36 +01:00
Laurent Destailleur
860ca15cfc Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2014-02-17 15:27:30 +01:00
Laurent Destailleur
fa7e7c75bf Fix: Add a protection if user has no option to edit stock 2014-02-17 11:48:57 +01:00
unknown
a6a26ec313 Fixed: Write note into field "note_private" in llx_facture ("note" deprecated) 2014-02-05 02:03:09 +01:00
Laurent Destailleur
579c7e8994 Merge pull request #1407 from modula71/develop 
Fixed: Write note into field "note_private" in llx_facture ("note" deprecated)
 2014-02-04 17:01:29 -08:00
Laurent Destailleur
8f3e9b1832 Fix: function must return a string 2014-02-03 20:05:56 +01:00
unknown
d7bc52b957 Fixed: Write note into field "note_private" in llx_facture ("note" deprecated) 2014-02-03 17:25:02 +01:00
Laurent Destailleur
fcfe94d4ec Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/product/liste.php
 2013-12-24 16:28:27 +01:00
Marcos García
9c6df4faf4 Corrected Copyright info for PR #1350 2013-12-16 22:56:59 +01:00
Marcos García
d65374bb02 Fixed bug #1196: Product barcode search does not expect 13th digit on EAN13 type 
Some code written by "hipnosapo" forum user in http://www.dolibarr.es/index.php/foro/7-bugs-versiones-estables/3891-ean13-buscador-codigo-barras-13-digitos#3891
 2013-12-15 18:44:53 +01:00
Laurent Destailleur
42f032ded3 Merge remote-tracking branch 'origin/3.4' into 3.5 2013-12-14 01:30:15 +01:00
Laurent Destailleur
88aa0ad4da Fix: Doxygen problems 2013-12-14 01:28:59 +01:00
Laurent Destailleur
2f88406677 Fix: [ bug #1075 ] POS module doesn't decrement stock of products in 
Delayed payment mode.
 2013-12-01 20:15:08 +01:00
Laurent Destailleur
dbd1c57f0a Fix: [ bug #1075 ] POS module doesn't decrement stock of products in 
Delayed payment mode.
 2013-12-01 20:13:52 +01:00
Laurent Destailleur
820cdde97b Fix: Currency is not visible 2013-12-01 20:13:45 +01:00
Raphaël Doursenaud
36a281ce58 CSS fixes 2013-09-05 20:54:19 +02:00
Laurent Destailleur
8d04f5a805 Fix: warning 2013-06-24 19:36:10 +02:00
Laurent Destailleur
cba1d73dd4 Fix: Can autoselect warehouse if only one warehouse 2013-06-24 19:34:56 +02:00
Laurent Destailleur
31f2d8922d Fix: warning 2013-06-24 19:34:02 +02:00
Laurent Destailleur
869e877cb7 Qual: We must not concat currency symbol after a price, but use the 
parameter currency of method price.
 2013-06-17 11:58:55 +02:00
Laurent Destailleur
51d11ff190 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/compta/facture/stats/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/includes/tcpdf/tcpdf.php
	htdocs/langs/el_GR/other.lang
	htdocs/langs/en_US/cashdesk.lang
	htdocs/langs/en_US/main.lang
	htdocs/langs/es_ES/products.lang
	htdocs/main.inc.php
	test/phpunit/NumberingModulesTest.php
 2013-06-09 16:49:47 +02:00
Laurent Destailleur
dd43f7a890 Fix: memory not freed 2013-06-07 19:12:38 +02:00
Laurent Destailleur
a88a3bb877 Look: More neutral css to match with other skins 2013-06-07 16:39:29 +02:00
Laurent Destailleur
a27d71f083 Fix: Miscellaneous fixes into cachdesk module: 
- Missing footer in cashdesk module
- Wrong field label
- Do not use limit list (Freeze when too many product)
 2013-06-07 15:59:47 +02:00