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

77862 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gérald Lelarge
903c3771ba FIX #12665 Mass invoice validation with stock management 
Normally the mass invoice validation is not authorized due to the need to choose the warehouse where to increase
or decrease the stock.
A message ErrorMassValidationNotAllowedWhenStockIncreaseOnAction is displayed to inform the user to do this
validation manually one by one.
The invoices should not be validated.
 2019-12-09 14:59:30 +01:00
Laurent Destailleur
3bb3643c19
Merge pull request #12575 from inoveaconseil/FIX#11974 
Fix #11974
 2019-12-01 12:44:36 +01:00
Laurent Destailleur
00e901ade8 Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2019-12-01 10:37:41 +01:00
Laurent Destailleur
bf99e8af5d Fix phpcs 2019-12-01 10:33:55 +01:00
Laurent Destailleur
971add1c2f Merge branch '10.0' of https://github.com/dolibarr/dolibarr into 10.0 2019-12-01 10:30:33 +01:00
Laurent Destailleur
6bf3af5d83 Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0 
Conflicts:
	htdocs/compta/tva/index.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
 2019-12-01 10:30:22 +01:00
Laurent Destailleur
1d564c2a39 Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 
Conflicts:
	htdocs/core/class/notify.class.php
 2019-12-01 00:58:01 +01:00
Laurent Destailleur
bfb8a4e8da
Merge pull request #12578 from Dolibarr/revert-12577-#12482 
Revert "FIX#12482"
 2019-12-01 00:55:13 +01:00
Laurent Destailleur
0e19b94719
Merge pull request #12565 from atm-maxime/fix_ticket_from_third 
FIX #12481 : fix ticket creation from thirdparty, mission $socid var
 2019-12-01 00:47:59 +01:00
Laurent Destailleur
199b0c11af
Merge pull request #12572 from atm-maxime/fix_deposit 
Fix deposit line was not translated in deposit invoice
 2019-12-01 00:44:17 +01:00
Laurent Destailleur
ec67fa4877
Merge pull request #12573 from atm-maxime/fix_vat_fiscal 
Fix #11228 : VAT dates regarding fiscal year
 2019-11-30 23:30:41 +01:00
Laurent Destailleur
47b35e9011
Merge pull request #12570 from atm-maxime/fix_margin_rights 
Fix margin rights
 2019-11-30 23:28:26 +01:00
Laurent Destailleur
20e941c585
Merge pull request #12579 from atm-maxime/fix_pdf_rouget 
Fix PDF rouget for SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME
 2019-11-30 23:26:43 +01:00
Maxime Kohlhaas
edb8bcb598 Fix PDF rouget for SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME 2019-11-30 22:58:32 +01:00
Laurent Destailleur
a352fd5a6e
Revert "FIX#12482" 2019-11-30 21:00:56 +01:00
Laurent Destailleur
639e258140
Merge pull request #12577 from inoveaconseil/#12482 
FIX#12482
 2019-11-30 20:54:08 +01:00
Nicolas
f2ff443641 FIX #12482 2019-11-30 20:04:27 +01:00
Inovea Conseil
7077457d50 Merge remote-tracking branch 'Dolibarr/8.0' into 8.0 2019-11-30 19:59:42 +01:00
Nicolas
13577d8d48 FIX #12473 2019-11-30 19:52:06 +01:00
Inovea Conseil
025e3d2a80 Merge remote-tracking branch 'Dolibarr/10.0' into 10.0 2019-11-30 19:44:37 +01:00
Maxime Kohlhaas
3c639772d9 Fix #11228 : VAT dates regarding fiscal year 2019-11-30 17:16:16 +01:00
Maxime Kohlhaas
558669dd88 Fix #6497 : deposit lines were not translated 2019-11-30 16:14:16 +01:00
Maxime Kohlhaas
2c165d0a61 Fix deposit date display in PDF 2019-11-30 15:53:50 +01:00
Maxime Kohlhaas
916954b301 Fix #12371 : access rights on contacts 2019-11-30 14:48:05 +01:00
Maxime Kohlhaas
9095482113 Fix margins access + menu display 2019-11-30 14:47:48 +01:00
Laurent Destailleur
b6c88d3c24 Merge branch '10.0' of https://github.com/dolibarr/dolibarr into 10.0 2019-11-30 12:04:01 +01:00
Laurent Destailleur
fe37983b06 Fix inversion of mime type and mime file name 2019-11-30 12:02:05 +01:00
Laurent Destailleur
7b828d1f0b
Merge pull request #12563 from atm-maxime/fix_notification_user_diabled 
Fix #12448 : notifications were sent to disabled user or contacts
 2019-11-30 01:18:35 +01:00
Laurent Destailleur
6bff3c7fd9
Merge pull request #12561 from atm-maxime/fix_loan_currency 
Fix #12496 : currency was € in loan schedule
 2019-11-30 01:17:43 +01:00
Maxime Kohlhaas
2a3012f12d Fix #12481 : fix ticket creation from thirdparty, mission $socid var 2019-11-30 01:15:47 +01:00
Laurent Destailleur
f0cc559f4c
Merge pull request #12562 from atm-maxime/fix_loan_update_rate 
Fix #12502 : loan rate wasn't updatable
 2019-11-30 01:11:00 +01:00
Maxime Kohlhaas
02b5da5db1 Fix #12448 : notifications were sent to disabled user or contacts 2019-11-30 00:57:21 +01:00
Maxime Kohlhaas
9116110737 Fix #12502 : loan rate wasn't updatable 2019-11-30 00:35:32 +01:00
Maxime Kohlhaas
d480da5629 Fix #12496 : currency was € in loan schedule 2019-11-29 23:43:42 +01:00
Laurent Destailleur
a4a805f618 Doxygen 2019-11-29 11:32:22 +01:00
Laurent Destailleur
3acd0bc2ff FIX Reduce number of request for list of products 2019-11-29 11:32:09 +01:00
Laurent Destailleur
cdf358f276
Merge pull request #12539 from altatof/langfilterfix 
FIX : filter language is an array
 2019-11-27 20:10:56 +01:00
Laurent Destailleur
425f88082f Prepare 10.0.4 2019-11-27 11:53:37 +01:00
altairis
355d7545f6 filter language is an array 2019-11-27 10:23:01 +01:00
Laurent Destailleur
6a210945b7 Prepare 10.0.4 2019-11-26 20:38:06 +01:00
Laurent Destailleur
c9cc503036
Merge pull request #12504 from hregis/10.0_mc 
FIX compatibility with Multicompany
 2019-11-26 09:22:20 +01:00
Laurent Destailleur
0a0fa3ec88
Merge pull request #12519 from aspangaro/10.0_p10 
Fix Ticket - Align language type with datas for translation
 2019-11-26 09:10:34 +01:00
Alexandre SPANGARO
6cc61fef9c Fix Ticket - Deprecated <center> 2019-11-26 04:32:38 +01:00
Alexandre SPANGARO
60f19d134c Fix Ticket - Align language type with datas for translation 2019-11-26 03:58:01 +01:00
Regis Houssin
1a43b58f8a FIX compatibility with Multicompany 2019-11-25 10:03:35 +01:00
Laurent Destailleur
c7aaed1264 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/fourn/facture/card.php
 2019-11-24 18:14:18 +01:00
Laurent Destailleur
8656143050 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-11-24 18:13:02 +01:00
Laurent Destailleur
98a7a5559f Fix bad fix 2019-11-24 18:12:40 +01:00
Laurent Destailleur
f2e01834a5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-11-24 18:11:46 +01:00
Laurent Destailleur
27e4c66dd5 Fix empty 2019-11-24 18:11:11 +01:00