Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-15 05:51:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
77,916 Commits 36 Branches 190 Tags
c72e7e6a973bcb58ffb51a22944b68f371769bc0
Commit Graph

6714 Commits

Author SHA1 Message Date
Laurent Destailleur
b5b5e1f6db More completepaybox integration with HMAC 2019-05-26 14:37:31 +02:00
Laurent Destailleur
410932f3f2 Trans 2019-05-26 12:01:08 +02:00
Laurent Destailleur
a5865d3e4a Debug BOM 2019-05-25 19:29:33 +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
ceba186de8 Trans 2019-05-23 22:42:26 +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
a-schild
445a66ed21 Added sage50 swiss translation texts for EN/DE/FR/IT 2019-05-22 10:21:35 +02:00
Laurent Destailleur
2c0c1dbef3 Debug modulebuilder 2019-05-21 16:16:19 +02:00
Laurent Destailleur
eafc35b00f Look and feel v10 2019-05-21 13:27:45 +02:00
Alexandre SPANGARO
d9e9cb2ea9 Merge branch 'develop' into 10.0_Differentiated_export 2019-05-20 15:02:05 +02:00
Laurent Destailleur
2bbb04085e Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/modulebuilder/template/class/myobject.class.php
 2019-05-19 02:15:01 +02:00
Maxime Kohlhaas
ea4dcbc77a Add translation 2019-05-18 17:07:55 +02:00
Laurent Destailleur
b40eb92ce7 Mass action for closing members 2019-05-18 16:25:45 +02:00
Laurent Destailleur
bd1ed4f7ac Merge branch 'develop' into 10.0_Differentiated_export 2019-05-16 21:26:20 +02:00
Laurent Destailleur
ced2c7383a Merge pull request #11178 from aspangaro/10.0_openconcerto 
NEW Accountancy Add OpenConcerto export format
 2019-05-16 21:24:14 +02:00
Laurent Destailleur
53b7f3fe92 Merge pull request #11173 from aspangaro/10.0_accountancy_cat 
NEW Add accoutancy sell intra and export in product import
 2019-05-16 21:14:46 +02:00
Alexandre SPANGARO
f123f9951f NEW Add OpenConcerto export format 2019-05-15 12:16:03 +02:00
Laurent Destailleur
9f8f45d5bc FIX Payment on supplier invoice should not mix credit note and standard 
invoices.
 2019-05-14 12:00:58 +02:00
Alexandre SPANGARO
7c9ccee64d NEW Accountancy - Differentiated export 2019-05-14 05:45:36 +02:00
Alexandre SPANGARO
d99424cdf0 NEW Add accoutancy sell intra and export in product import 2019-05-13 21:19:18 +02:00
Laurent Destailleur
7a75567ad9 FIX Debug ticket module 2019-05-12 16:34:49 +02:00
Laurent Destailleur
a664cd6461 Fix check when uploading a non image as user photo 2019-05-10 20:09:41 +02:00
Laurent Destailleur
acc57343a9 Trans 2019-05-09 18:34:10 +02:00
Laurent Destailleur
78c4a3cced Fix lang 2019-05-09 18:33:50 +02:00
Laurent Destailleur
2ff81cd262 Fix duplicate key 2019-05-09 18:08:23 +02:00
Laurent Destailleur
46b0545c4a Debug module reception 2019-05-09 17:26:06 +02:00
Laurent Destailleur
b8f2f957bf Sync transifex 2019-05-09 16:58:31 +02:00
Laurent Destailleur
2ffad20e9f fix typo 2019-05-09 16:37:46 +02:00
Laurent Destailleur
9672c7ccca Translation 2019-05-09 16:21:53 +02:00
Laurent Destailleur
84714f39e2 Fix setup of terminal 2019-05-09 13:37:20 +02:00
Laurent Destailleur
6e69db8a1a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/product/doc/pdf_standard.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
	htdocs/filefunc.inc.php
 2019-05-09 12:27:14 +02:00
Laurent Destailleur
d3bbb93ada Fix template for situation 
Conflicts:
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2019-05-09 12:16:43 +02:00
andreubisquerra
84cfa00bf1 Terminals 2019-05-08 18:29:00 +02:00
Laurent Destailleur
1e036f3513 Correct support for type price on module builder 
Fix link of ref in cash fence list
 2019-05-08 01:09:38 +02:00
Laurent Destailleur
60bf3452c3 Hide export in EEC for non european countries 2019-05-04 12:26:54 +02:00
Alexandre SPANGARO
0359b1820a Merge remote-tracking branch 'upstream/develop' into develop 2019-05-03 14:10:57 +02:00
Alexandre SPANGARO
61547e3f82 NEW Manage account sell_intra & sell_export in page default product 2019-05-03 14:08:20 +02:00
Laurent Destailleur
dd4e70efe7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
	htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
	htdocs/accountancy/class/lettering.class.php
 2019-05-03 12:14:17 +02:00
Laurent Destailleur
e694d0b2c2 Merge pull request #11101 from aspangaro/9.0_lettering 
FIX Massive debug in lettering function
 2019-05-03 11:39:45 +02:00
Laurent Destailleur
eab49d4300 NEW Update Stripe library to 6.34.3 2019-05-03 02:22:27 +02:00
Laurent Destailleur
10d853cdb3 Work on stripe payment using intent with option 
STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION
 2019-05-02 21:54:28 +02:00
Laurent Destailleur
8442c86436 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/index.php
 2019-05-02 17:40:41 +02:00
Laurent Destailleur
4899d03ff8 FIX Confusion between expired and late 2019-05-02 17:15:24 +02:00
Alexandre SPANGARO
cbe23741eb FIX Massive debug in lettering function 2019-05-02 14:06:55 +02:00
Laurent Destailleur
e2c7c0574e Merge pull request #11086 from andreubisquerra/master 
NEW Add history to view and print previous sales on TakePos.
 2019-05-02 14:04:57 +02:00
Laurent Destailleur
a75223c850 Debug ticket module 2019-05-02 13:53:13 +02:00
Laurent Destailleur
e81f10c790 Debug hidden option MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION 2019-05-02 13:45:49 +02:00
Laurent Destailleur
4a81e8fd62 Debug call to apilayer 2019-05-02 13:24:28 +02:00
Laurent Destailleur
4756499a81 Debug module builder for generation of APIs 2019-05-02 12:03:14 +02:00