Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

9416 Commits

Author SHA1 Message Date
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
Alexandre SPANGARO
d4384f507d WIP 2019-05-23 09:25:09 +02:00
Alexandre SPANGARO
65070afce4 WIP 2019-05-22 17:22:49 +02:00
a-schild
ab646450d6 Revert changes in DE/FR/IT languages, since they are generated/maintained via Transifex 2019-05-22 17:03:49 +02:00
Alexandre SPANGARO
a182b89bb0 Merge branch 'develop' into 10.0_closure2 2019-05-22 13:52:13 +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
ATM-Nicolas
d58603bd1e Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_propal_list_column 2019-05-20 09:13:37 +02:00
ATM-Nicolas
6be48e6952 NEW : Amount HT invoiced column in propal list 2019-05-20 08:59:44 +02:00
Frédéric FRANCE
aef850f6d3 zapier for dolibarr 2019-05-19 21:12:22 +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
a5b1de4f6a Fix tab that should not be visible 2019-05-09 17:52:55 +02:00
Laurent Destailleur
46b0545c4a Debug module reception 2019-05-09 17:26:06 +02:00
Laurent Destailleur
a94c291b76 Dolibarization 2019-05-09 16:59: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
ATM-Nicolas
77d3f22163 NEW : Amount invoiced column in propal list 2019-05-07 14:39:16 +02:00
Alexandre SPANGARO
4baffae297 Merge remote-tracking branch 'upstream/develop' into 10.0_closure2 2019-05-05 22:43:02 +02:00
Alexandre SPANGARO
4e16992796 WIP 2019-05-05 14:07:42 +02:00
Laurent Destailleur
60bf3452c3 Hide export in EEC for non european countries 2019-05-04 12:26:54 +02:00
Laurent Destailleur
3ad478c25e Merge pull request #11109 from aspangaro/develop 
NEW Manage account sell_intra & sell_export in page accoutancy admin default product
 2019-05-04 12:18:23 +02:00
Laurent Léonard
476d15868c Fix civility translation in dutch dict language file 2019-05-04 06:25:53 +02:00
Alexandre SPANGARO
0359b1820a Merge remote-tracking branch 'upstream/develop' into develop 2019-05-03 14:10:57 +02:00