Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-15 14:01:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
71,061 Commits 36 Branches 190 Tags
01e7b5747d3ece7bb4623c8889ffa98ebb39bc7c
Commit Graph

15416 Commits

Author SHA1 Message Date
Laurent Destailleur
41f21f3867 Translation 2018-07-08 20:06:24 +02:00
Philippe GRAND
47e80123d5 Docs : update code 2018-07-07 11:36:46 +02:00
Philippe GRAND
fe5bfe3aaf Docs : update comments 2018-07-07 10:51:09 +02:00
Philippe GRAND
1e1ed485f5 Docs : update comments 2018-07-07 10:47:56 +02:00
Regis Houssin
e8afd7e833 Fix: use "supplier" instead "reseller" 2018-07-07 08:48:26 +02:00
Regis Houssin
1522a5b22d Fix: differentiate customer prices from supplier prices sharing 2018-07-07 08:43:59 +02:00
Alexandre SPANGARO
655d55eae6 Add customer accountancy code on deposit slips export 2018-07-07 02:46:56 +02:00
Laurent Destailleur
a62fd8ef84 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-06 16:10:45 +02:00
Laurent Destailleur
45d1a14c8e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-06 16:10:37 +02:00
Laurent Destailleur
4db7e04523 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.formactions.class.php
	htdocs/loan/index.php
 2018-07-06 16:09:32 +02:00
Laurent Destailleur
2a676b414a Merge pull request #9024 from atm-maxime/fix_link_create_event 
Fix link to create event had no socid if from thirdparty card
 2018-07-06 14:26:38 +02:00
Laurent Destailleur
2113965b57 Update html.formactions.class.php 2018-07-06 14:26:21 +02:00
Laurent Destailleur
a725ceaf42 Merge pull request #9049 from grandoc/new_branch_04_07_2018 
docs: complete comments
 2018-07-06 14:21:47 +02:00
Laurent Destailleur
05ed721a8c Fix name of constant for module TICKET 2018-07-06 13:09:07 +02:00
delcroix Patrick
5f7a308552 Merge branch 'develop' into comptafiles 2018-07-05 22:35:40 +02:00
delcroix Patrick
e88dd77ea5 no change 2018-07-05 21:42:34 +02:00
patrick Delcroix
0e7ba92784 New: Accounting dossier file checks page 
Page to check to attachement of those operation
invoice, invoicesupplier, salary, donation, Expense, tax
 2018-07-05 21:34:36 +02:00
Philippe GRAND
988130d2a1 docs: complete comments 2018-07-05 17:04:11 +02:00
Philippe GRAND
4cbe3a5bc7 docs: complete comments 2018-07-05 17:01:47 +02:00
Maxime Kohlhaas
39f890d84a Fix TICKETSUP var name 2018-07-05 14:51:00 +02:00
Maxime Kohlhaas
74b9f87cab Fix ticket : missing file for numbering 2018-07-05 14:35:12 +02:00
BENKE Charlene
633bf3034f new add total price on dashboard 2018-07-05 11:52:58 +02:00
Laurent Destailleur
3a593f88f1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/upgrade2.php
 2018-07-05 10:28:24 +02:00
Philippe GRAND
1cc73ae8ca docs: complete comments 2018-07-05 10:16:20 +02:00
Inovea Conseil
d53f03b596 Update after comment 2018-07-05 09:14:36 +02:00
Laurent Destailleur
5883899bc7 Little debug of option WEBSITE_USE_WEBSITE_ACCOUNTS 2018-07-05 02:33:39 +02:00
Philippe GRAND
afd3868a8a docs: complete comments 2018-07-04 14:38:56 +02:00
Laurent Destailleur
91b7ee5fc2 NEW Add function isValidMXRecord 2018-07-04 11:07:28 +02:00
Laurent Destailleur
38cd5180d9 FIX for migration from old versions 2018-07-03 20:11:59 +02:00
Laurent Destailleur
275f981545 FIX for migration from old versions 2018-07-03 20:08:55 +02:00
Laurent Destailleur
5583600066 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-03 17:37:50 +02:00
Laurent Destailleur
50df452b9e Fix status "Supplier" not always visible. 2018-07-03 17:37:23 +02:00
Laurent Destailleur
f7b8e09268 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
 2018-07-03 13:53:34 +02:00
Laurent Destailleur
f93f5bd6e0 Fix travis 2018-07-03 13:49:41 +02:00
Laurent Destailleur
e1e813b895 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-03 12:33:26 +02:00
Laurent Destailleur
12c43d7722 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-03 12:33:17 +02:00
Laurent Destailleur
cfb41d4329 FIX: If module workflow disabled, we must disable autoclassification too 2018-07-03 11:43:50 +02:00
Laurent Destailleur
7ef6b16d31 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/install/step1.php
 2018-07-03 10:04:25 +02:00
Laurent Destailleur
0138b0e0b7 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/html.form.class.php
 2018-07-03 10:01:30 +02:00
Laurent Destailleur
e72107422b Merge pull request #9040 from defrance/patch-122 
add holliday_admin_prepare_head
 2018-07-02 16:18:25 +02:00
Laurent Destailleur
4e7f9b1b4d Merge pull request #9038 from hregis/8.0_multicompany 
Fix: possibility to overload permissions (multicompany sharing)
 2018-07-02 16:12:40 +02:00
Philippe GRAND
0aa58537bb update code comment 2018-07-02 15:07:00 +02:00
Philippe GRAND
74c45fa876 update code comment 2018-07-02 14:30:30 +02:00
Philippe GRAND
f43cce34c8 update code comment 2018-07-02 13:34:21 +02:00
Philippe GRAND
8497f56a04 update description code 2018-07-02 12:35:06 +02:00
Laurent Destailleur
9c5d34fc5f Fix translation 2018-07-02 12:26:32 +02:00
Laurent Destailleur
a2c89d8110 Fix page code in pdf 2018-07-02 12:25:09 +02:00
Laurent Destailleur
63f3143718 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-02 12:18:34 +02:00
Laurent Destailleur
dc69960b00 Code comment 2018-07-02 12:17:34 +02:00
Laurent Destailleur
7bf33b1bac Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/hrm/index.php
	htdocs/install/mysql/tables/llx_website_account.key.sql
	htdocs/modulebuilder/template/myobject_card.php
 2018-07-02 12:16:51 +02:00