lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
52,298 Commits 43 Branches 150 Tags 886 MiB
9e8fcd19aa
Commit Graph

3003 Commits

Author SHA1 Message Date
Laurent Destailleur
83b297a9b2 FIX VAT Rate was not visible in log of old price list 2016-01-30 15:33:11 +01:00
fmarcet
e3d8a9a8a4 FIX: Doesn't collect the value of the cost price correctly 2016-01-27 12:13:31 +01:00
fmarcet
eec8d30625 FIX: Not returning the correct multilevel price 2016-01-27 10:57:04 +01:00
Marcos García de La Fuente
83263e242e Corrected typo of PR #4444 2016-01-23 20:32:22 +01:00
Laurent Destailleur
4df584e57b Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/lib/files.lib.php
 2016-01-23 11:51:56 +01:00
Laurent Destailleur
dbaa43f3be Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/holiday/card.php
	htdocs/holiday/list.php
	htdocs/user/card.php
 2016-01-23 11:45:39 +01:00
Laurent Destailleur
dc438792f4 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/fourn/commande/card.php
 2016-01-23 11:39:37 +01:00
Laurent Destailleur
9be246baa5 Merge remote-tracking branch 'origin/3.6' into 3.7 2016-01-23 11:32:06 +01:00
Laurent Destailleur
d2f5f5c01f Merge pull request #4266 from fappels/develop_multi_warehouse 
Add shipping and dispatching from/to multiple warehouses
 2016-01-22 02:26:25 +01:00
Marcos García de La Fuente
da637db162 FIX #4440 Wrong price is filled by Product::fetch into multiprices arrays 2016-01-18 10:17:59 +01:00
Laurent Destailleur
7b14b5e115 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
 2016-01-14 13:30:27 +01:00
Laurent Destailleur
7b4ebb498e Merge pull request #4415 from fappels/3.9-4409 
Fix #4409 totals not shown in stock/list
 2016-01-14 11:07:47 +01:00
fappels
f264b5e451 Revert changes stock/list, moved to PR #4415 2016-01-13 16:43:34 +01:00
fappels
284722ef3c Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_multi_warehouse 2016-01-13 16:41:34 +01:00
fappels
f150676908 Fix #4409 totals not shown in stock/list 2016-01-13 16:33:51 +01:00
Laurent Destailleur
d396612a7c NEW: Add a new method for margin calculation. Added margin on "cost 
price" to margin on WAP price and margin on "best supplier price".
 2016-01-13 12:48:59 +01:00
Laurent Destailleur
381eea0dbf Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
	htdocs/core/menus/standard/eldy.lib.php
 2016-01-12 23:10:25 +01:00
Laurent Destailleur
d7fdcc83bb Fix missing search criteria 2016-01-12 22:03:19 +01:00
fappels
51b08f579b Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_multi_warehouse 
Fix Conflicts:
 2016-01-12 13:56:00 +01:00
Laurent Destailleur
6648ef0064 Fix missing include 2016-01-10 12:37:56 +01:00
Laurent Destailleur
cc4c5873e6 Fix sql error 2016-01-10 12:37:48 +01:00
Laurent Destailleur
8653e7fa5c Merge remote-tracking branch 'origin/3.9' into develop 2016-01-10 00:12:51 +01:00
Juanjo Menent
2bb2f22955 Merge pull request #4252 from aspangaro/develop-a4 
Accountancy Add a list to select accounting account on product card
 2016-01-09 17:41:43 +01:00
Laurent Destailleur
37c106acff Fix search on shipment 2016-01-08 23:59:02 +01:00
Laurent Destailleur
99f3870ee6 Fix no picot if no warehouse set 
Fix search on warehouse
 2016-01-08 23:54:40 +01:00
Laurent Destailleur
96e5651ed5 Fix missing field on list. Restor ability to search on supplier ref. 2016-01-03 14:38:47 +01:00
Laurent Destailleur
52cd5d505e Fix several bugs on css, translation or look 2016-01-01 23:44:23 +01:00
Laurent Destailleur
ed3f0ce86b Fix totalnboflines not correctly managed 2015-12-28 00:20:48 +01:00
Laurent Destailleur
6f474c403c Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
	htdocs/societe/notify/card.php
	htdocs/societe/price.php
 2015-12-27 19:15:20 +01:00
Laurent Destailleur
97030b05ce FIX #4281 2015-12-27 18:20:39 +01:00
Juanjo Menent
cdd1641b66 Merge pull request #4284 from frederic34/patch-7 
typo
 2015-12-24 15:50:24 +01:00
Frédéric FRANCE
45b60c7800 typo 2015-12-24 00:01:05 +01:00
philippe grand
1eeee203d7 [Qual] comments should be in english 2015-12-22 09:37:27 +01:00
aspangaro
07b42f2bd5 Fix bug with empty code - return -1 2015-12-22 07:31:59 +01:00
aspangaro
61208537d8 Merge remote-tracking branch 'Upstream/develop' into develop-a4 2015-12-22 07:13:56 +01:00
Laurent Destailleur
ad5f65e988 Fix: use the mini image on tooltip of thirdparties 2015-12-21 17:32:57 +01:00
Laurent Destailleur
db7a98f0ef Fix: When a payment mode was disabled, it was not visible on old 
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
 2015-12-21 13:56:59 +01:00
Laurent Destailleur
0a515ca8c0 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2015-12-21 12:38:23 +01:00
Laurent Destailleur
7e03aaee23 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-12-21 12:25:47 +01:00
Laurent Destailleur
96b6f0d8fb Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	composer.json
	htdocs/product/ajax/products.php
	htdocs/product/class/product.class.php
 2015-12-21 12:24:24 +01:00
Laurent Destailleur
f243b5230f Fix search filter disappear and clean filter button not visible. 2015-12-20 20:24:12 +01:00
Laurent Destailleur
1c1d176715 Fix statistics was reporting bad value 2015-12-19 19:39:42 +01:00
Laurent Destailleur
9334cf8fd1 FIX #4243 sql injection 2015-12-19 18:03:08 +01:00
Laurent Destailleur
3b2a921378 Fix a serial is required for stock change 2015-12-19 14:05:38 +01:00
aspangaro
51640c19bb Merge remote-tracking branch 'Upstream/develop' into develop-a4 
Conflicts:
	htdocs/product/card.php
 2015-12-19 05:43:22 +01:00
fappels
bce7f52f79 merge Dolibarr/develop 2015-12-18 20:05:14 +01:00
fappels
7fc8007571 New add shipping and dispatching from/to multiple warehouses 
Add select2 to warehouse selectors
Ship customer orderline from multiple warehouses
Dispatch client orderline to multiple warehouses
 2015-12-18 18:00:31 +01:00
Laurent Destailleur
dc8e5f45ae Merge pull request #4254 from grandoc/develop 
[Qual] Uniformize code
 2015-12-18 17:13:22 +01:00
Laurent Destailleur
5eea1ce7d9 Fix several warnings 2015-12-17 19:37:24 +01:00
philippe grand
c9d6607b04 [Qual] Uniformize code 2015-12-17 14:14:44 +01:00
aspangaro
85f87d45df Add select account in product card 2015-12-17 12:57:08 +01:00
Raphaël Doursenaud
c2642acdba Fix CI build 578 (Syntax error) 
empty() only supports variables in PHP < 5.5
 2015-12-17 10:03:42 +01:00
aspangaro
c34e698d59 Merge remote-tracking branch 'Upstream/develop' into develop-a4 2015-12-17 06:17:32 +01:00
aspangaro
b064d1106b Accountancy Add a list to select accounting account on product card 2015-12-17 06:16:29 +01:00
Laurent Destailleur
9973315a07 Fix we muste have ($limit = $conf->liste_limite; $offset = $limit * 
$page) and not ($offset = $conf->liste_limite * $page).
In a future $limit that could be overwrite from search post form.
 2015-12-16 19:38:40 +01:00
Laurent Destailleur
6133298e58 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-16 19:27:23 +01:00
Laurent Destailleur
f87ccc97e2 Miscellaneous fixes 2015-12-16 19:26:50 +01:00
Laurent Destailleur
33ea5c83b7 Merge pull request #4238 from fappels/develop 
Fix product list page offset calculation
 2015-12-16 19:26:32 +01:00
Laurent Destailleur
cd70b296c1 Merge pull request #4223 from fappels/develop-shipment-error-handling 
Fix not complete output of error messages in shipment
 2015-12-16 19:09:35 +01:00
Laurent Destailleur
d95be87e64 Merge pull request #4222 from grandoc/develop 
Fix not complete output of error messages
 2015-12-16 19:08:06 +01:00
Francis Appels
3568b889bf Update list.php 
Fix page offset calculation
 2015-12-16 15:42:24 +01:00
fappels
9fa742ceb2 [QUAL] Shipment error handling 2015-12-14 21:38:26 +01:00
philippe grand
0fe64c6091 [Qual] Uniformize code 2015-12-14 20:54:55 +01:00
Frédéric FRANCE
af5bcc5312 Update mouvement.php 2015-12-14 09:31:40 +01:00
Laurent Destailleur
da8e38b253 Merge pull request #4213 from grandoc/develop 
[Qual] Uniformize code
 2015-12-13 19:56:43 +01:00
Laurent Destailleur
b949468b75 Merge pull request #4210 from IonAgorria/pricesel-fix 
Price expression selector fix
 2015-12-13 19:56:32 +01:00
Laurent Destailleur
e37fc87cd5 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-12-13 17:34:06 +01:00
Laurent Destailleur
1978eebb69 Fix bad merge 2015-12-13 17:33:20 +01:00
Laurent Destailleur
ef13bd43b0 Fix bad merge 2015-12-13 17:27:55 +01:00
Laurent Destailleur
3b595f0247 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/report.lib.php
	htdocs/langs/en_US/accountancy.lang
 2015-12-13 16:23:33 +01:00
Laurent Destailleur
a462cd232d Merge remote-tracking branch 'origin/3.7' into 3.8 2015-12-13 16:09:09 +01:00
Laurent Destailleur
4a88c9ea9f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/product/class/product.class.php
 2015-12-13 15:53:57 +01:00
philippe grand
de0a13ae8f [Qual] Uniformize code 2015-12-12 10:59:02 +01:00
Ion Agorria
57102aefde Price expression selector fix 2015-12-12 01:38:24 +01:00
philippe grand
2cd49043a6 [Qual] Close database handler should be after Footer 2015-12-11 19:37:12 +01:00
Laurent Destailleur
7f3531a04c Enhance script to track duplicate translation string and use it to 
remove around 50 duplicates.
 2015-12-06 13:34:57 +01:00
fmarcet
eb98bd1e78 FIX: Not delete a product when have customer price 2015-12-03 14:02:26 +01:00
Laurent Destailleur
12702ee128 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/report.lib.php
	htdocs/product/stock/class/mouvementstock.class.php
 2015-12-03 12:59:13 +01:00
Laurent Destailleur
7105fabb79 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/langs/en_US/users.lang
	htdocs/product/stock/class/mouvementstock.class.php
 2015-12-03 12:51:49 +01:00
ricardomm
eb504ffacc minor fix accessing $db 2015-12-02 11:53:23 +01:00
Laurent Destailleur
de730c9762 NEW Introduce cost price on product. 2015-11-30 21:20:45 +01:00
Laurent Destailleur
b47dbc7a5f Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/install/pgsql/functions/functions.sql
	htdocs/projet/element.php
 2015-11-26 01:32:21 +01:00
Laurent Destailleur
c15c0f6fbb Minor css fix 2015-11-21 15:31:27 +01:00
Marcos García de La Fuente
9f27e2323f FIX #3734 Do not show empty links of deleted source objects in stock movement list 2015-11-21 11:51:23 +01:00
Marcos García de La Fuente
eba5832d3a FIX #4049 PHP warning when trying to access a non-existing product/service 2015-11-21 10:58:58 +01:00
Laurent Destailleur
60724df496 Merge pull request #4038 from atm-maxime/develop 
NEW add info page on product card
 2015-11-21 01:51:32 +01:00
Laurent Destailleur
bf2af33b89 Merge pull request #4015 from ParisLiakos/develop 
Add a trigger for product translation deletion
 2015-11-21 00:19:40 +01:00
Maxime Kohlhaas
9c1545bc1b NEW add info page on product card 2015-11-19 14:45:05 +01:00
Maxime Kohlhaas
826592c480 Fix info and banner on societe 2015-11-19 14:43:00 +01:00
Maxime Kohlhaas
e4125c9802 NEW : info function for product card 2015-11-19 14:26:32 +01:00
Laurent Destailleur
6dc6bab556 Support of 'small', 'mini' and '' image size everywhere. 2015-11-17 10:38:00 +01:00
Paris Liakos
fb6819764d Add PRODUCT_DEL_MULTILANGS trigger for translation deletion on product 2015-11-17 01:20:58 +02:00
Laurent Destailleur
a8bfa1a258 Merge pull request #4011 from ParisLiakos/develop 
Add triggers for product and category translation changes
 2015-11-16 23:50:18 +01:00
Paris Liakos
146aa7815b Add X_SET_MULTILANGS triggers to make possible reacting on translation changes for products and categories 2015-11-16 20:27:51 +02:00
Laurent Destailleur
6bd6be0912 Debug and rename experimental module "supplier proposal". Still work to 
do: Must fix the PDF to be compliant with a request quotation to a
supplier (so no need to show vat, unit price, ...).
 2015-11-15 19:23:39 +01:00
Laurent Destailleur
778941b549 Merge pull request #3948 from marcosgdf/missing-changes 
Missing changes of PR #3927
 2015-11-13 02:29:56 +01:00
Marcos García de La Fuente
3c42df935d Corrected HTML closing tag 2015-11-12 10:26:05 +01:00
Laurent Destailleur
59a79442b0 Enhance code for select field list feature. 
Add gender and employee on user list.
 2015-11-11 17:05:18 +01:00
Frédéric FRANCE
2799dbf45b Update product.php 2015-11-10 23:02:54 +01:00
Marcos García de La Fuente
80ef746348 Reverted unwanted changes 2015-11-08 19:23:02 +01:00