Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
68,848 Commits 35 Branches 179 Tags 1.7 GiB
f8b0e535fa
Commit Graph

317 Commits

Author SHA1 Message Date
Laurent Destailleur
cb9ada2119 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/product/price.php
 2018-12-01 18:19:45 +01:00
Inovea Conseil
0ba5fda3da
Update price.php 2018-12-01 16:11:49 +01:00
Inovea Conseil
8964ec7ea1
Fix #9572 
Fix #9572
 2018-12-01 15:58:37 +01:00
Laurent Destailleur
6eb9f13ec2 Fix warning 2018-07-11 10:01:26 +02:00
Laurent Destailleur
cf5f7bf06d
Update price.php 2018-05-29 10:52:55 +02:00
Laurent Destailleur
f473607249
Merge branch 'develop' into patch-15 2018-05-29 10:49:28 +02:00
Frédéric FRANCE
d986909109
loadlangs 2018-05-26 23:52:52 +02:00
Frédéric FRANCE
a487cf6806
Update price.php 2018-05-26 15:15:38 +02:00
Frédéric FRANCE
0623ff7667
fix logic 2018-05-24 11:56:19 +02:00
Frédéric FRANCE
8547827575
Merge remote-tracking branch 'upstream/develop' into multipriceqty 2018-05-23 17:06:02 +02:00
Frédéric FRANCE
efbb053e54
PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES 2018-05-23 17:05:08 +02:00
Laurent Destailleur
de84f0e687 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/filefunc.inc.php
 2018-05-21 23:35:09 +02:00
fappels
90d2ccc79c Fix product vat update error handling 
Product vat update does not show update error if update result negative.
 2018-05-17 21:29:15 +02:00
Frédéric FRANCE
9f7496ce04
Update price.php 2018-02-05 17:47:29 +01:00
Laurent Destailleur
4747e84b74
Update price.php 2018-01-11 00:40:33 +01:00
HENRY Florian
5af39e80e0
Update price.php 2018-01-10 20:38:06 +01:00
florian HENRY
fdedd6f75b fix 7963 2018-01-08 20:54:40 +01:00
Laurent Destailleur
2b056b0177 BUG Fix of old hidden feature price per quantity 2017-12-22 12:53:46 +01:00
Laurent Destailleur
c85acbfc11 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/install/repair.php
 2017-11-14 19:47:33 +01:00
Laurent Destailleur
b5196b7164 FIX A lot of several fix on local taxes and NPR tax 2017-11-13 14:24:40 +01:00
Laurent Destailleur
a501a20487 NEW Search filters in lists are restored when using "back to list" 2017-10-03 16:00:52 +02:00
Laurent Destailleur
4f76545b62 Add missing fields to manage localtax on supplier products 2017-09-26 10:47:08 +02:00
Laurent Destailleur
5482f80c0e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-26 10:30:47 +02:00
Laurent Destailleur
59571b1ce1 FIX #7473 Mass update of vat rates and other bugs on localtax 2017-09-26 10:29:44 +02:00
Regis Houssin
cdd1473cfa Fix: avoid Warning: A non-numeric value encountered 2017-09-18 16:30:01 +02:00
Laurent Destailleur
e9eefb170f Merge pull request #7212 from ATM-Marc/NEW_price_formObjectOptions_hook 
NEW hook formObjectOptions in the form setting product selling price
 2017-08-17 18:25:30 +02:00
Laurent Destailleur
7c840b8348 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-08-04 15:32:30 +02:00
florian HENRY
53add04a2e fix :add missing hook into product price card 2017-07-31 10:28:24 +02:00
Marc de Lima Lucio
2cb89b2d8b Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_price_formObjectOptions_hook 2017-07-27 17:16:58 +02:00
Marc de Lima Lucio
677d50df5b NEW: add 'formObjectOptions' hook to the form setting the product selling price 2017-07-27 17:11:15 +02:00
Laurent Destailleur
2870798d07 Fix remove warnings 2017-07-13 00:35:10 +02:00
Laurent Destailleur
4c0fcb2b9a Fix total with tax does not include local taxes. To solve, i show both 
totals.
 2017-07-07 14:58:57 +02:00
Laurent Destailleur
8abec461a6 Fix total with tax does not include local taxes. To solve, i show both 
totals.
 2017-07-07 12:31:00 +02:00
Laurent Destailleur
59bd4749a8 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/product/class/product.class.php
 2017-06-24 10:27:10 +02:00
Laurent Destailleur
1211e0d7ab FIX vat code not saved during product creation. 2017-06-23 12:09:21 +02:00
Laurent Destailleur
b889db997a Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/datepicker.php
	htdocs/core/get_menudiv.php
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/search_page.php
	htdocs/main.inc.php
	htdocs/master.inc.php
	htdocs/product/list.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
	htdocs/user/card.php
	htdocs/user/index.php
 2017-06-14 10:48:34 +02:00
Laurent Destailleur
5def2d2600 Add div to help debug of html content 2017-06-13 11:14:52 +02:00
Laurent Destailleur
ba3a74576c Merge 5.0 2017-06-12 18:22:51 +02:00
Laurent Destailleur
64a6ff9687 Fix test for navigation disabling for external users 2017-06-12 16:26:25 +02:00
Laurent Destailleur
7c0de18ac1 Fix code comment 2017-06-10 12:56:28 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Laurent Destailleur
7dbe3b1da9 Merge pull request #6843 from aspangaro/6.0-multijournal 
Fix : Sql error on salaries index for accountancy multijournal + debug
 2017-05-18 17:45:21 +02:00
Laurent Destailleur
1d6b4cb28a Look and feel v6 2017-05-17 15:25:09 +02:00
Laurent Destailleur
a8afa547f0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture.php
 2017-05-17 15:20:17 +02:00
Laurent Destailleur
d86b42b024 Missing title, bad css 2017-05-17 14:45:08 +02:00
Alexandre SPANGARO
93554b7e30 Typo searchpicto 2017-05-14 21:06:33 +02:00
Laurent Destailleur
0d11fce834 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-05-12 15:45:30 +02:00
Laurent Destailleur
5581e5da72 FIX New vat code not correctly implemented if "1 price per customer". 2017-05-12 13:12:17 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
Laurent Destailleur
979bcd3a9b NEW Can add a background image on login page 2017-03-31 11:40:31 +02:00