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

1676 Commits

Author SHA1 Message Date
Laurent Destailleur
2ce8529c06 Merge pull request #10346 from grandoc/new_branch_16_01_2019 
update with html5 compliant code
 2019-01-16 19:39:31 +01:00
Philippe Grand
98ebc0a667 Update index.php 2019-01-16 19:24:15 +01:00
Philippe Grand
551a1a5e58 Update lines.php 2019-01-16 19:23:41 +01:00
Philippe Grand
3cc68aca21 Update index.php 2019-01-16 19:23:08 +01:00
Philippe Grand
13ea2d93dd Update index.php 2019-01-16 19:22:29 +01:00
Philippe Grand
5810fa9acd Update list.php 2019-01-16 19:21:19 +01:00
Philippe Grand
dff30f17a5 Update productaccount.php 2019-01-16 19:20:28 +01:00
Philippe Grand
c9aa00c09f Update productaccount.php 2019-01-16 19:19:54 +01:00
Philippe Grand
6d266d78b1 Update productaccount.php 2019-01-16 19:19:14 +01:00
Philippe Grand
27edf7c803 Update importaccounts.php 2019-01-16 19:18:36 +01:00
Philippe Grand
9e699b59ad Update fiscalyear.php 2019-01-16 19:17:53 +01:00
Philippe GRAND
3168c76946 update with html5 compliant code 2019-01-16 17:39:40 +01:00
atm-quentin
013c078c8b Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice 2019-01-16 10:52:46 +01:00
Laurent Destailleur
05cdf895e8 Allow supplier code to be '0', but not empty ('') 2019-01-09 11:10:44 +01:00
Laurent Destailleur
86f0d6c26f FIX Warning on non complete setup 2019-01-09 11:02:06 +01:00
Laurent Destailleur
5d0ff28556 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/societe/card.php
 2019-01-08 01:56:03 +01:00
Laurent Destailleur
d2f6899346 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/admin/defaultvalues.php
	htdocs/societe/card.php
 2019-01-08 01:53:00 +01:00
Laurent Destailleur
6e078105ab Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
 2019-01-06 01:22:10 +01:00
ldestailleur
0ce514079b FIX Button journalize grey when mandatroy setup not done 2019-01-05 12:51:08 +01:00
ldestailleur
451b3e30cc Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/langs/en_US/cashdesk.lang
 2019-01-04 19:36:20 +01:00
Laurent Destailleur
c690b92410 Merge pull request #10277 from aspangaro/9.0_accountancy_html 
FIX: #10221 Html codes in accounting export
 2019-01-02 19:52:18 +01:00
Laurent Destailleur
a39336c80d Simple join is better than RIGHT JOIN 2019-01-02 19:50:23 +01:00
Alexandre SPANGARO
cbcf097ec1 FIX: #10221 Html codes in accounting export 2018-12-29 23:20:30 +01:00
Alexandre SPANGARO
3eb5b06472 FIX: Generation of FEC:CompteLib 2018-12-29 22:26:06 +01:00
Alexandre SPANGARO
41c7af590d NEW: Accountancy - Add default accounting account for member subcriptions 2018-12-29 22:11:24 +01:00
Ferran Marcet
dc93cccbe1 FIX: Loan impossible to account 2018-12-28 12:57:04 +01:00
Laurent Destailleur
44a6644969 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-18 21:55:53 +01:00
Laurent Destailleur
89068ffef1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/adherents/subscription.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/langs/es_ES/companies.lang
	htdocs/langs/es_ES/errors.lang
	htdocs/product/stock/product.php
	htdocs/user/card.php
 2018-12-18 21:55:14 +01:00
Alexandre SPANGARO
f728b28a67 FIX: Missing information on Agiris Export 2018-12-17 06:02:29 +01:00
Laurent Destailleur
20d24f2feb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-16 18:45:30 +01:00
Alexandre SPANGARO
6eb9013430 Fix: Accountancy - remove alert on bank account configuration when bank account is closed 2018-12-16 06:36:55 +01:00
Alexandre SPANGARO
8148ea8361 Revert "Fix: Problem with loan integration in general ledger" 
This reverts commit 50da3c2ed2.
 2018-12-16 06:16:14 +01:00
Alexandre SPANGARO
50da3c2ed2 Fix: Problem with loan integration in general ledger 2018-12-16 06:14:33 +01:00
Laurent Destailleur
eb66d45947 Merge branch 'develop' into 10.0_accoutancy_stats 2018-12-15 15:17:15 +01:00
Laurent Destailleur
f55db6dd84 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/resources/dbmodel/dolibarr_schema.mwb
 2018-12-15 14:09:16 +01:00
Laurent Destailleur
2c5a5e5eac Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-14 16:25:48 +01:00
Laurent Destailleur
e0011222d1 Fix syntax error 2018-12-14 16:25:37 +01:00
Laurent Destailleur
88a52aa11d Merge branch 'develop' into develop_mc 2018-12-14 15:58:52 +01:00
Laurent Destailleur
185524bd50 Update fiscalyear.php 2018-12-14 15:49:58 +01:00
Laurent Destailleur
2011afe6fb Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
Laurent Destailleur
539e2c55cd FIX #9629 #9625 2018-12-14 10:33:07 +01:00
Laurent Destailleur
c1ce902f91 FIX #9629 #9625 2018-12-14 10:31:09 +01:00
Regis Houssin
8953a3ed73 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_mc

Conflicts:
	ChangeLog
 2018-12-03 08:46:03 +01:00
Maxime Kohlhaas
2e496ea83a QUAL rename facnumber by ref 2018-12-02 17:33:44 +01:00
Alexandre SPANGARO
088c002ed1 NEW: Add stats on entries & movements by fiscal year 2018-12-02 11:01:11 +01:00
Alexandre SPANGARO
2466fa224c Merge remote-tracking branch 'upstream/develop' into 10.0_accoutancy_stats 2018-12-02 10:48:55 +01:00
Laurent Destailleur
6d84036f66 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/contact/list.php
	htdocs/core/class/html.form.class.php
	htdocs/expensereport/card.php
	htdocs/install/doctemplates/shipment/template_shipment.odt
	htdocs/public/payment/newpayment.php
 2018-12-01 19:23:06 +01:00
florian HENRY
47eda86e2f fix scrutinizer 2018-12-01 14:39:04 +01:00
Alexandre SPANGARO
7f1a48916e Merge remote-tracking branch 'upstream/develop' into develop 2018-12-01 07:00:34 +01:00
florian HENRY
38059ed60d fix #10006 2018-12-01 00:39:37 +01:00