lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
89,109 Commits 43 Branches 150 Tags 886 MiB
9165ea9e67
Commit Graph

89109 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
b62c229efc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/9.0.0-10.0.0.sql
	htdocs/install/mysql/tables/llx_bom_bomline.sql
 2019-05-26 01:32:55 +02:00
Laurent Destailleur
b7a3cdd7c6 Debug BOM module 2019-05-26 01:31:54 +02:00
Laurent Destailleur
bd61c1f7f5 Debug BOM module 2019-05-26 01:16:06 +02:00
Laurent Destailleur
9f9f3bda63 Debug BOM module 2019-05-26 01:06:19 +02:00
Laurent Destailleur
a5865d3e4a Debug BOM 2019-05-25 19:29:33 +02:00
Laurent Destailleur
b67363d769 Fix rename export php lib to avoi duplicate with old library. 2019-05-25 18:54:43 +02:00
Laurent Destailleur
d6aef89719 Fix css 2019-05-25 12:42:12 +02:00
Alexandre SPANGARO
95e3e21f18 Merge remote-tracking branch 'upstream/develop' into develop 2019-05-25 04:50:40 +02:00
Laurent Destailleur
728e270307 Fix css 2019-05-24 23:11:05 +02:00
Alexandre SPANGARO
09faf3aa5b Accountancy - Use Ansi on Agiris model export & indent 2019-05-24 21:48:36 +02:00
Laurent Destailleur
c04d082ad1 FIX Import of chart of account 2019-05-24 18:14:15 +02:00
Laurent Destailleur
bad565cc64 Fix syntax error 2019-05-24 18:13:24 +02:00
Laurent Destailleur
0fc7ad7c1f Add one param to fetch of accounting account to solve chart import 2019-05-24 18:05:29 +02:00
Laurent Destailleur
769fbdb429 FIX the id was not loaded in fetch of accounting system 2019-05-24 17:39:37 +02:00
Laurent Destailleur
49991eabf8 Fix import of accounting account from ref in import profiles 2019-05-24 17:09:18 +02:00
Laurent Destailleur
63824861a6 Fix import of chart of account. The account parent was not managed. 2019-05-24 16:58:06 +02:00
Christophe Battarel
83d883c36a finally eldy is always right 2019-05-24 15:14:34 +02:00
Christophe Battarel
4863ddcb00 Merge branch '8.0' of https://github.com/Dolibarr/dolibarr into 8.0 2019-05-24 15:13:23 +02:00
Laurent Destailleur
826e3fabf1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-24 15:00:23 +02:00
Laurent Destailleur
ccfb4f575b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2019-05-24 15:00:14 +02:00
Laurent Destailleur
89455672a2 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2019-05-24 14:58:21 +02:00
Christophe Battarel
4f23cc0893 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-05-24 12:59:14 +02:00
Laurent Destailleur
8c6f2c1a5b
Merge pull request #11243 from andreubisquerra/master 
Fix TakePOS terminal bug
 2019-05-24 12:58:51 +02:00
Laurent Destailleur
1ac54cfaa9
Merge pull request #11241 from OPEN-DSI/fix-order-deleteline-in-shipment 
Fix check if order line is not in a shipment line before deleting
 2019-05-24 12:58:09 +02:00
Laurent Destailleur
7a0c6859bd
Merge pull request #11240 from ATM-Marc/FIX_8.0_crabe_situation_vat 
FIX: crabe pdf: bad detailed VAT for situation invoices, in situations S2 and above
 2019-05-24 12:57:01 +02:00
Christophe Battarel
545cdd0762 test include return on FALSE 2019-05-24 12:54:24 +02:00
Laurent Destailleur
5d6e4a444a
Merge pull request #11237 from ATM-Marc/FIX_8.0_situation_discount 
FIX: situation invoices: block progress percentage change for discount lines
 2019-05-24 12:53:34 +02:00
Laurent Destailleur
bca5a56db1
Merge pull request #11236 from a-schild/develop 
Add accountancy export option for Sage50 Swiss
 2019-05-24 12:52:51 +02:00
Laurent Destailleur
c760a5a8b9 FIX #11233 2019-05-24 12:48:44 +02:00
Christophe Battarel
abc7c2f0f8 test include return on TRUE 2019-05-24 12:33:40 +02:00
Christophe Battarel
aaaad71347 FIX : do not include disabled modules tpl 2019-05-24 12:10:58 +02:00
Christophe Battarel
d8a6db6e42 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-05-24 12:02:44 +02:00
andreubisquerra
99a96bffe2 Fix TakePOS terminal bug 2019-05-24 08:36:43 +02:00
Laurent Destailleur
ceba186de8 Trans 2019-05-23 22:42:26 +02:00
Lionel VESSILLER
1c1b3c376e Fix check if order line is not in a shipment line before deleting 2019-05-23 15:57:02 +02:00
Marc de Lima Lucio
49385fcab3 FIX: situation invoices: bad detailed VAT in situations following the first one 2019-05-23 14:37:40 +02:00
Laurent Destailleur
cc971f4204 Fix ident 2019-05-23 14:30:34 +02:00
Laurent Destailleur
ba7b601387 Fix phpcs 2019-05-23 14:29:37 +02:00
Laurent Destailleur
e8ba312d2a Fix phpcs 2019-05-23 14:25:16 +02:00
Laurent Destailleur
5f639f611a Try to introduce rules on tab 2019-05-23 13:12:04 +02:00
Laurent Destailleur
43e098caae Fix phpcs 2019-05-23 12:35:53 +02:00
Alexandre SPANGARO
582b4b906e Merge remote-tracking branch 'upstream/develop' into 10.0_closure2 2019-05-23 11:32:13 +02:00
Alexandre SPANGARO
34a91ef96f Apply button reexport on view list 2019-05-23 11:21:41 +02:00
Alexandre SPANGARO
2085958a69 Merge branch 'develop' into 10.0_Differentiated_export 2019-05-23 11:10:07 +02:00
Alexandre SPANGARO
4ba8cf0641 Fix 2019-05-23 11:08:06 +02:00
Alexandre SPANGARO
d4384f507d WIP 2019-05-23 09:25:09 +02:00
Laurent Destailleur
111239094a Work to finish module BOM for v10 2019-05-22 20:28:24 +02:00
Laurent Destailleur
815a467eb7 Debug clone of products 2019-05-22 19:54:03 +02:00
Laurent Destailleur
c131363dd1 Debug modulebuilder 2019-05-22 19:40:48 +02:00
Laurent Destailleur
7eeb028375 Debug modulebuilder 2019-05-22 19:34:08 +02:00