lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
64,295 Commits 43 Branches 150 Tags 886 MiB
b063c19084
Commit Graph

303 Commits

Author SHA1 Message Date
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
BENKE Charlie
2e6ab393df add next_prev_filter for pagination 2017-03-25 10:45:01 +01:00
Laurent Destailleur
832c91417a Fix the default_vat_code was not correctly saved and shown on the 
product price.
 2017-03-04 19:16:09 +01:00
Laurent Destailleur
a5019e1619 Fix position of field 2017-03-04 18:17:04 +01:00
Laurent Destailleur
bbd32b9294 Fix bad count 2017-03-04 14:34:43 +01:00
Laurent Destailleur
d14e4dbaba Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on 2017-01-15 20:49:20 +01:00
Laurent Destailleur
0eded9a8b7 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-19 02:36:10 +01:00
Laurent Destailleur
3f5d67d4d6 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-12-19 02:35:16 +01:00
Laurent Destailleur
876722733a Better fix to get localtax 2016-12-19 02:33:54 +01:00
gauthier
1f1c75adfb FIX : HT and TTC price should always be displayed together 2016-12-14 15:50:50 +01:00
Laurent Destailleur
ecab7cb70e Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/product/class/product.class.php
 2016-12-14 12:29:41 +01:00
Laurent Destailleur
d2e4888bdd Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-12-14 12:21:33 +01:00
Juanjo Menent
56aafa4660 Fix #5646 Error editing Sell Price on products/services 2016-12-10 23:25:13 +01:00
Laurent Destailleur
bd8f923cee Several fixes in filter on lists 2016-11-29 22:52:16 +01:00
Laurent Destailleur
663f7938f8 Fxi responsive design 2016-11-27 20:02:57 +01:00