lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
77,413 Commits 43 Branches 150 Tags 886 MiB
3a8d8ee902
Commit Graph

4664 Commits

Author SHA1 Message Date
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
348ab4765c Fix sql injection 2019-09-06 15:20:04 +02:00
Laurent Destailleur
80daf29d79 Fix conflict between new module reception and old process 
Fix inventory record does not need status at creation

Conflicts:
	htdocs/fourn/commande/card.php
 2019-09-06 01:55:22 +02:00
Laurent Destailleur
d4fb1d134d
Merge pull request #11801 from jtraulle/fix-11682-10.0 
Fix #11683 Correct links to create a new product or service from search results
 2019-09-03 13:02:17 +02:00
Jean Traullé
c84f1baf17
Fix #11683 Correct links to create a new product or service from search results 2019-08-31 00:18:53 +02:00
Laurent Destailleur
55505604c1
Merge pull request #11397 from atm-josselin/FIX_product_document_and_special_characters 
FIX : filepath of generated documents doesn't handle products with sp…
 2019-08-27 14:12:48 +02:00
Laurent Destailleur
27cd6cd308 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/product/fournisseurs.php
	htdocs/stripe/payment.php
 2019-08-22 12:39:07 +02:00
Laurent Destailleur
a35f010e55 FIX name and position of hook FIX #11710 2019-08-22 12:30:14 +02:00
Laurent Destailleur
ee50c41e74 Fix phpcs 2019-08-16 17:34:23 +02:00
Laurent Destailleur
2824dee11a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/product/dynamic_price/class/price_parser.class.php
 2019-08-10 01:20:17 +02:00
Laurent Destailleur
6a8910f109
Merge pull request #11649 from ptibogxiv/patch-216 
FIX qty in invoice list on product's stats
 2019-08-10 00:37:35 +02:00
Je2fb
2dee289fc6 Update price_parser.class.php 
Calculation with supplier_min_price work

Conflicts:
	htdocs/product/dynamic_price/class/price_parser.class.php
 2019-08-10 00:21:13 +02:00
Laurent Destailleur
88c66d24fe
Merge pull request #11662 from ptibogxiv/patch-219 
FIX duration when creating service
 2019-08-09 23:53:55 +02:00
Regis Houssin
0b831ccdf7 FIX better help message with multicompany 2019-08-09 09:33:14 +02:00
ptibogxiv
322ec32ff5
FIX duration when creating service 2019-08-07 20:16:53 +02:00
ptibogxiv
0fc92b92a2
Update facture.php 2019-08-06 16:47:54 +02:00
ptibogxiv
ee8d99351d
Update facture.php 2019-08-06 16:28:18 +02:00
Frédéric FRANCE
69985339d8
Update price_parser.class.php 2019-08-06 11:47:34 +02:00
Alexandre SPANGARO
323d2df210 Presentation nowrap on amount 2019-07-24 10:42:00 +02:00
Laurent Destailleur
fb5af65f4d FIX #11466 2019-07-15 23:56:05 +02:00
Laurent Destailleur
694be619b2 Fix doxygen 2019-07-11 22:16:32 +02:00
Laurent Destailleur
8e3620fce1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/facture/invoicetemplate_list.php
 2019-07-04 12:26:17 +02:00
atm-quentin
8cdb251ca5 FIX product_use_units was set to 0 each time a conf in block other was set 2019-07-02 10:18:03 +02:00
atm-josselin
c24a95b7ad Sanitize at creation of the product instead of the creation of the filepath 2019-07-01 09:31:01 +02:00
Laurent Destailleur
93b0e45246 Fix duplicate class in some cases 2019-06-29 02:27:58 +02:00
Laurent Destailleur
8aebcc45b2 Fix message to not show sometimes 2019-06-29 01:54:38 +02:00
Laurent Destailleur
97827f5172 Fix print 2019-06-29 01:44:49 +02:00
atm-quentin
7f62fdbfe4 FIX buyprice barcode default val 2019-06-25 14:27:44 +02:00
Laurent Destailleur
b202c7eaa0 Fix confusion between ->childs and ->childsoncascade 2019-06-22 20:17:40 +02:00
Laurent Destailleur
e28bf71964 Fix error management of warehouse->delete 2019-06-20 18:15:14 +02:00
Laurent Destailleur
1a6dc83d4c Fix: default accounting account for eec and export sales were not used. 2019-06-20 12:25:58 +02:00
Laurent Destailleur
663998bab1 Fix scrutinizer errors 2019-06-18 20:15:04 +02:00
Laurent Destailleur
08d5ca4ddb Debug page to export accounting documents 2019-06-17 17:53:43 +02:00
Francis Appels
a26c868783 Fix scrutinizer bugs 2019-06-12 22:05:10 +02:00
Francis Appels
2ecde139f0 Fix stock mouvement does not need virtual stock. 2019-06-07 18:09:03 +02:00
Josep Lluís
bb0313a1a4 Fix Hide disabled fields 
Hide disabled fields in product list
 2019-06-07 15:23:20 +02:00
Laurent Destailleur
2218994958 FIX Duplicate encoding on error message 2019-05-29 09:51:45 +02:00
Laurent Destailleur
815a467eb7 Debug clone of products 2019-05-22 19:54:03 +02:00
Laurent Destailleur
18f1952e2d Fix set of properties 2019-05-22 14:49:18 +02:00
Laurent Destailleur
e60131e3ee Fix look and feel v10 2019-05-22 13:42:27 +02:00
Laurent Destailleur
c1a0e9385f
Merge pull request #11219 from frederic34/patch-2 
dol_print_object_info return void
 2019-05-21 22:38:39 +02:00
Laurent Destailleur
22e897b1a1 Clean and prepare code to fix a SQL injection 2019-05-21 17:22:38 +02:00
Laurent Destailleur
e463b17c15 Fix look and feel v10 2019-05-21 15:31:56 +02:00
Laurent Destailleur
5f23cf7e2a CSS 2019-05-19 13:51:47 +02:00
Frédéric FRANCE
53a09a0dd4
Update agenda.php 2019-05-19 09:15:51 +02:00
Laurent Destailleur
94f5f6c655
Merge pull request #11207 from atm-john/FIX_scrutyniser 
FIX: scrutinizer feedback
 2019-05-18 16:05:24 +02:00
Laurent Destailleur
11fea03074
Merge pull request #11026 from atm-john/new_look_and_feel_title_button 
NEW : look and feel title button
 2019-05-18 16:04:47 +02:00
ATM John BOTELLA
f714b45efb FIX scrutinizer feedback 2019-05-18 15:53:07 +02:00
Laurent Destailleur
fd5048ef73 Fix reported by phpstan 2019-05-15 19:16:48 +02:00
Laurent Destailleur
49d65710ba Fix date missing 2019-05-14 10:31:11 +02:00