Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
79,034 Commits 36 Branches 189 Tags
fec67aade476d54d96db49b200bf53e0927e5eb0
Commit Graph

4289 Commits

Author SHA1 Message Date
Laurent Destailleur
a9bb891760 Merge pull request #11767 from aspangaro/11.0_digitaria 
NEW Digitaria model for numbering accountancy thirdparty
 2019-09-03 15:01:10 +02:00
Laurent Destailleur
c4a4efe0dc Merge pull request #11769 from Tim-Otte/develop 
NEW: Added odt support to supplier orders
 2019-09-03 13:04:33 +02:00
Tim Otte
0f02a621ba Seriously? One newline failed the stickler ci test? 2019-09-03 10:39:11 +02:00
Tim Otte
443f16bddf Removed debug output 2019-09-03 10:36:00 +02:00
Laurent Destailleur
210effc742 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-30 04:18:23 +02:00
a-schild
ad779bc714 Correctly initialize $addDescription in all cases 2019-08-29 09:46:10 +02:00
a-schild
c38e29185c Fix for #11783 2019-08-29 09:43:49 +02:00
Laurent Destailleur
bb893fd3a8 FIX Missing the filter fields in export of expense report and leaves 2019-08-27 18:16:34 +02:00
Tim Otte
5abfc04900 Merge branch 'develop' into develop 2019-08-27 16:37:41 +02:00
Alexandre SPANGARO
47b9af09a5 Fix stickler 2019-08-27 16:37:14 +02:00
Tim Otte
75152cb210 Added odt support to supplier orders 2019-08-27 16:22:16 +02:00
Alexandre SPANGARO
958361b45e Merge branch 'develop' into 11.0_digitaria 2019-08-27 14:11:27 +02:00
Alexandre SPANGARO
d7f8df2e45 NEW Digitaria model for numbering accountancy thirdparty 2019-08-27 14:03:33 +02:00
Laurent Destailleur
999db7ed41 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/salaries/card.php
	htdocs/compta/sociales/class/chargesociales.class.php
	htdocs/takepos/invoice.php
 2019-08-26 16:49:25 +02:00
Laurent Destailleur
2b8c57b714 Merge pull request #11724 from ptibogxiv/patch-228 
Fix stripelive_oauthcallback.php
 2019-08-26 16:34:40 +02:00
ptibogxiv
30b929c621 Update modAdherent.class.php 2019-08-23 13:57:22 +02:00
ptibogxiv
839ba76ae4 Update stripetest_oauthcallback.php 2019-08-23 08:58:08 +02:00
ptibogxiv
06fdd5ddbc Update stripelive_oauthcallback.php 2019-08-22 22:50:41 +02:00
ptibogxiv
0be59646a8 Update stripelive_oauthcallback.php 2019-08-22 22:00:53 +02:00
Laurent Destailleur
ae7ba9ff54 Doc 2019-08-17 15:15:52 +02:00
Laurent Destailleur
8874a0f3c1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-15 23:39:11 +02:00
Laurent Destailleur
386f929fe3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/lib/website.lib.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
 2019-08-15 23:39:02 +02:00
Laurent Destailleur
6430c74793 Merge pull request #11168 from hregis/develop_menu 
NEW add new function "setEntity()" and better compatibility with Multicompany
 2019-08-15 21:00:05 +02:00
Laurent Destailleur
4534826583 Merge pull request #11633 from fmarcet/10.0 
FIX: Make protected all pfd models functions
 2019-08-15 19:04:32 +02:00
Laurent Destailleur
bb35d9be0c Fix copy of templates during activation of module 2019-08-15 01:50:01 +02:00
Regis Houssin
7c8b3c9a38 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-08-13 07:34:02 +02:00
Ferran Marcet
f1c0442a77 FIX: Add comment before protected functions 2019-08-12 10:16:04 +02:00
Laurent Destailleur
8647a20c18 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/langs/en_US/admin.lang
	htdocs/product/dynamic_price/class/price_parser.class.php
	htdocs/product/stats/facture.php
 2019-08-10 01:57:43 +02:00
Laurent Destailleur
2824dee11a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/product/dynamic_price/class/price_parser.class.php
 2019-08-10 01:20:17 +02:00
VESSILLER
ae144a6910 NEW compute column value from others columns in import module 2019-08-08 17:31:16 +02:00
Frédéric FRANCE
7f23b77cbe Update pdf_proforma.modules.php 2019-08-05 15:00:06 +02:00
Frédéric FRANCE
fde526f59d Update pdf_einstein.modules.php 2019-08-05 14:58:50 +02:00
Ferran Marcet
fd1204bcd2 FIX: Make protected all pfd models functions 2019-08-05 13:41:25 +02:00
Laurent Destailleur
ded8a71b9a Merge pull request #11614 from grandoc/patch_01_08_2019 
add some translation
 2019-08-01 16:39:05 +02:00
Laurent Destailleur
3d8f6dca76 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-01 16:30:32 +02:00
Laurent Destailleur
5a719769bc Fix phpcs 2019-08-01 16:29:18 +02:00
Laurent Destailleur
6512435f9f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/modules/cheque/doc/pdf_blochet.class.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
 2019-08-01 16:27:55 +02:00
Philippe GRAND
18a56c7ef2 add some translation 2019-08-01 15:59:37 +02:00
Philippe GRAND
b32dbbfb74 Merge remote-tracking branch 'upstream/develop' into develop 2019-08-01 15:43:30 +02:00
Laurent Destailleur
90ddc0a214 FIX #10930 2019-08-01 14:27:57 +02:00
Regis Houssin
d9ea61e47c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop_menu

Conflicts:
	htdocs/commande/class/commande.class.php
 2019-07-31 12:49:56 +02:00
Laurent Destailleur
6b789a13a1 Merge pull request #11562 from atm-quentin/FIX_pdf_cheque 
FIX name was able to be in field but went back to new line
 2019-07-30 22:00:58 +02:00
Laurent Destailleur
a7390e7e47 Merge pull request #11396 from ATM-Consulting/New_retained_warranty_develop 
NEW Management of retained warranty on situation invoices
 2019-07-30 21:53:09 +02:00
Laurent Destailleur
34f78c555d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-30 20:55:35 +02:00
Laurent Destailleur
192fb45ce7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/accountancy/bookkeeping/list.php
	htdocs/adherents/card.php
	htdocs/compta/sociales/list.php
	htdocs/compta/sociales/payments.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/holiday/class/holiday.class.php
	htdocs/viewimage.php
 2019-07-30 20:55:15 +02:00
Laurent Destailleur
5f2439bf0a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-07-30 20:37:44 +02:00
Marc de Lima Lucio
703506c0e2 FIX: import filter error 2019-07-30 14:11:21 +02:00
Marc de Lima Lucio
449ef92007 FIX: categories import: prevent mismatch between category type and object type 2019-07-30 12:31:03 +02:00
Laurent Destailleur
11e3aa5860 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-29 11:07:11 +02:00
Laurent Destailleur
f825711206 Code comment 2019-07-29 11:01:29 +02:00