Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
79,102 Commits 36 Branches 189 Tags
c7da05e4a13a8c6063ac6cb0dec5cb90d2864dfc
Commit Graph

1716 Commits

Author SHA1 Message Date
Laurent Destailleur
d65af06d20 Merge pull request #11869 from atm-john/new_ticket_messaging_page 
New ticket messaging page design
 2019-09-30 15:34:35 +02:00
Laurent Destailleur
a4d405c6f9 Merge pull request #11906 from OPEN-DSI/new-form-products-select-labels-units 
NEW Add units in select products lines
 2019-09-27 15:30:44 +02:00
Laurent Destailleur
f3bc319a78 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/takepos/takepos.php
 2019-09-27 14:11:14 +02:00
Laurent Destailleur
6858dce344 Rename table for categorie of warehouses 2019-09-27 13:28:28 +02:00
Laurent Destailleur
aa5f35f14f Fix image on ticket 2019-09-26 14:28:34 +02:00
VESSILLER
3654a5d01c FIX selectFields for GROUP BY and show only if units defined 2019-09-17 10:05:35 +02:00
VESSILLER
555ea977c9 NEW Add units in select products lines 2019-09-16 15:32:31 +02:00
ATM john
907669bb51 New ticket messaging page 2019-09-11 23:30:09 +02:00
Laurent Destailleur
61cf47aa16 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-10 00:14:07 +02:00
Laurent Destailleur
08f8ad6f30 FIX javascript error when using dol_use_jmobile=1 2019-09-10 00:09:18 +02:00
david
ac539d20b9 FIX #10460 compatibility with MariaDB 10.4 2019-09-09 11:10:08 +02:00
david
48b2a11da2 FIX #10460 compatibility with MariaDB 10.4 2019-09-08 05:15:26 +02:00
Laurent Destailleur
a5f7211730 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/install/repair.php
 2019-09-06 16:10:55 +02:00
Laurent Destailleur
ec1751bae9 Doxygen 2019-09-06 02:47:20 +02:00
Laurent Destailleur
1a8f271bf4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-09-03 17:41:56 +02:00
Laurent Destailleur
2c02e4d118 Merge branch 'develop' into FIX_cron_module_conf_to_display_link_to_cron_task_list 2019-09-03 15:28:52 +02:00
John Botella
c2f570ae60 FIX: remove disabled product type from product list 2019-08-27 11:54:20 +02:00
Laurent Destailleur
4b5d9e44b2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-26 22:47:33 +02:00
Laurent Destailleur
45ff873064 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/core/class/html.form.class.php
 2019-08-26 22:44:49 +02:00
Laurent Destailleur
b6db04a727 Fix add missing filter on entity on stock listing for product combo 2019-08-26 22:42:04 +02:00
Laurent Destailleur
76bd9a09a6 FIX #11570 2019-08-26 22:34:41 +02:00
Laurent Destailleur
386f929fe3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/lib/website.lib.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
 2019-08-15 23:39:02 +02:00
Laurent Destailleur
ffece8dd34 Better link for syntax help 2019-08-15 18:46:48 +02:00
Juanjo Menent
03a2377abc Fix: allow access from any other class that inherits Form class. 2019-08-02 12:31:24 +02:00
Laurent Destailleur
a46bfc7a29 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/project.lib.php
 2019-07-25 17:54:14 +02:00
Laurent Destailleur
389976699c Fix responsive 2019-07-24 16:29:50 +02:00
Laurent Destailleur
865ebb9de2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/ticket/class/ticket.class.php
 2019-07-20 13:29:10 +02:00
Laurent Destailleur
9f9598ac99 FIX missing token 2019-07-20 11:44:54 +02:00
Laurent Destailleur
e85c2202e8 FIX missing token 2019-07-20 11:44:31 +02:00
Laurent Destailleur
48b4aa4c8d Fix link to ticket 2019-07-19 18:29:33 +02:00
Laurent Destailleur
50480bf517 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/index.php
 2019-07-18 18:23:24 +02:00
Christophe Battarel
aab23a1531 FIX : do not return formatted prices in json string 2019-07-16 17:50:43 +02:00
Laurent Destailleur
adfbd62f8b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-14 00:44:35 +02:00
Laurent Destailleur
e0095871aa Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/stats/byratecountry.php
	htdocs/core/class/html.form.class.php
 2019-07-14 00:19:56 +02:00
Laurent Destailleur
b66ad24d85 Fix save of doc template for recuring invoices. 2019-07-14 00:10:15 +02:00
Laurent Destailleur
63c93be94e Update html.form.class.php 2019-07-04 12:20:34 +02:00
atm-greg
2f5b9ccb22 fix case objecttmp is an invoice 2019-07-03 17:00:18 +02:00
Laurent Destailleur
13200a4d51 Merge pull request #11350 from frederic34/patch-7 
NEW can specify hour start end for selectDate and step for minutes
 2019-06-20 03:24:23 +02:00
Laurent Destailleur
a74eaaff4d Fix sort of linked elements 2019-06-17 15:54:54 +02:00
Frédéric FRANCE
1a1f3493c9 NEW can specify hour start end for selectDate and step for minutes 2019-06-17 14:03:57 +02:00
AXeL-dev
82b37a514c Fixed empty verification (0 might be considered as empty also, so its better to compare string value with '') 2019-06-01 16:27:06 +00:00
AXeL-dev
d2c853c47b Fix #11256 2019-06-01 15:00:15 +00:00
Laurent Destailleur
b81c3a6d2b Fix look and feel v10 2019-05-26 18:23:30 +02:00
Laurent Destailleur
22e897b1a1 Clean and prepare code to fix a SQL injection 2019-05-21 17:22:38 +02:00
florian HENRY
9ef5767fd5 phpcs 2019-05-18 12:28:39 +02:00
florian HENRY
02af7ca25e fix pb with multicompny payment dictionnary on faxcture card 2019-05-18 12:11:28 +02:00
Laurent Destailleur
a664cd6461 Fix check when uploading a non image as user photo 2019-05-10 20:09:41 +02:00
Laurent Destailleur
6e69db8a1a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/product/doc/pdf_standard.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
	htdocs/filefunc.inc.php
 2019-05-09 12:27:14 +02:00
Laurent Destailleur
c2abedeb24 Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 9.0 2019-05-08 21:43:57 +02:00
Laurent Destailleur
2ee72e2fdf Update html.form.class.php 2019-05-08 02:02:07 +02:00