Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-07 01:23:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
79,564 Commits 37 Branches 191 Tags
ab8199f71aa00a2e4b32d7130f84c2a2f877fa00
Commit Graph

18128 Commits

Author SHA1 Message Date
Laurent Destailleur
e7f56b67d8 Look and feel v11 2019-10-10 23:00:33 +02:00
Laurent Destailleur
a8676e63c8 CSS 2019-10-10 16:46:50 +02:00
Laurent Destailleur
e2113c2f33 Fix sort lost after uploading a file 2019-10-10 16:41:24 +02:00
Laurent Destailleur
b34cbfad74 Rename const 2019-10-10 15:23:45 +02:00
Laurent Destailleur
d9a0dc2986 Fix trans 2019-10-10 15:20:44 +02:00
Laurent Destailleur
aebae5ff83 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/margins.lang
	htdocs/user/class/user.class.php
 2019-10-10 10:37:17 +02:00
Laurent Destailleur
072a0a26d6 Use a font awesome icon to show "shippable" flag on orders. 2019-10-09 18:07:00 +02:00
Laurent Destailleur
db651a607d Use fontawesome for img_warning 2019-10-09 17:33:46 +02:00
Laurent Destailleur
f2d04fe55c Code comment 2019-10-09 11:51:10 +02:00
Laurent Destailleur
9f4aadae18 Missing Nature, Duration and Type fields in export of products 2019-10-09 02:05:20 +02:00
Frédéric FRANCE
5ac8ba8c65 fix travis 2019-10-08 22:13:19 +02:00
Laurent Destailleur
f55a4d77e4 css 2019-10-08 16:41:03 +02:00
stickler-ci
7e841350db Fixing style errors. 2019-10-08 13:24:41 +00:00
Laurent Destailleur
138ac0d524 Merge pull request #12063 from laudeco/feature/export_user_bank_account 
NEW Add bank data of user into the expense report exports
 2019-10-08 15:19:46 +02:00
Laurent Destailleur
06eedece26 Merge pull request #11371 from bafbes/abb90058 
New:Show labels of countries in modulebuilder
 2019-10-08 15:17:16 +02:00
Laurent Destailleur
c724eef85c Update ccountry.class.php 2019-10-08 15:16:56 +02:00
Laurent Destailleur
bd867f5e80 Update ccountry.class.php 2019-10-08 15:16:23 +02:00
Laurent Destailleur
651dec8dc2 Doxygen 2019-10-08 11:27:52 +02:00
Laurent Destailleur
43a70e5548 Clean code to use the new $extrafields->attributes array 2019-10-08 09:28:50 +02:00
Laurent Destailleur
d55b7689bb Merge pull request #11920 from ptibogxiv/patch-264 
NEW translation for member type
 2019-10-08 09:00:49 +02:00
Laurent De Coninck
c8fb1e852c export some other fields on the expense reports 
When the user requests the export of the expense reports, some fields
were missing such as the bank account information of the user.

This PR adds the support of all those fields on the expense report
export. Now when you export the expense report you have :
* The bank name
* The bank code
* The IBAN
* The BIC
* The owner
* The owner address
 2019-10-08 08:51:09 +02:00
Laurent Destailleur
99da69fb69 NEW Can edit the price of predefined product during adding in documents 2019-10-07 21:01:52 +02:00
Laurent Destailleur
51be0fad99 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-10-07 20:52:39 +02:00
Laurent Destailleur
bb72efefc5 Fix phpcs 2019-10-07 20:52:27 +02:00
Laurent Destailleur
e5026157e3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2019-10-07 20:49:30 +02:00
Laurent Destailleur
539f4355c3 Try to fix stickler 2019-10-07 20:48:44 +02:00
Frédéric FRANCE
c68de09ba9 use $this->db in box 2019-10-07 20:27:51 +02:00
Laurent Destailleur
156eb7fa61 Merge branch '10.0' into hotfix/12041-security-generate-password 2019-10-07 20:22:19 +02:00
Laurent De Coninck
2ba8506608 validate the 0 as min value consecutive; meaning not take that rule into account 2019-10-07 17:53:23 +02:00
Laurent Destailleur
297313e7de CSS 2019-10-07 16:01:36 +02:00
Laurent Destailleur
c6c498fd67 Merge pull request #11829 from atm-florian/dev_contactdefault 
NEW : Address/Contact by default on third parties
 2019-10-07 15:27:58 +02:00
Laurent Destailleur
3a15485e99 Update interface_90_modSociete_ContactRoles.class.php 2019-10-07 15:27:23 +02:00
Laurent Destailleur
240785922e Update interface_90_modSociete_ContactRoles.class.php 2019-10-07 15:23:30 +02:00
Laurent Destailleur
a9c844460b Debug use of widget on Accounting home page 2019-10-07 14:39:29 +02:00
Laurent Destailleur
035da6a711 Merge pull request #11951 from aspangaro/11.0_accountancy_portal 
NEW Accountancy - Add an option to hide FAQ on index and add specific widget in this area
 2019-10-07 14:24:22 +02:00
ptibogxiv
9aa7226d39 Update member.lib.php 2019-10-07 13:38:05 +02:00
Laurent Destailleur
e02794248e Merge branch 'develop' into patch-264 2019-10-07 13:25:16 +02:00
Laurent Destailleur
12d243b8d4 FIX #12040 2019-10-07 13:13:46 +02:00
Laurent Destailleur
1060ac4608 Merge pull request #12035 from atm-john/develop_fix_missing_dolgetstatus 
Fix : LibStatut missing dolgetstatus usage
 2019-10-07 13:08:33 +02:00
Laurent Destailleur
c2a7ae23bc Merge pull request #12034 from aspangaro/11_faicon 
Fix Fa-icon
 2019-10-07 13:03:27 +02:00
Laurent Destailleur
71e922635b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-07 12:57:52 +02:00
Laurent Destailleur
7015e71105 FIX #12041 2019-10-07 12:53:32 +02:00
Laurent Destailleur
e7aa78cb4a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-07 12:37:20 +02:00
Laurent Destailleur
23de8694fa Fix module files 2019-10-07 12:37:01 +02:00
Laurent Destailleur
f4b752ee81 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/core/modules/modProduct.class.php
	htdocs/expedition/card.php
 2019-10-07 12:33:13 +02:00
VESSILLER
219b0d8925 FIX Import of product using units 2019-10-07 12:26:02 +02:00
Laurent Destailleur
ecd7d1208d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-07 10:42:49 +02:00
Laurent Destailleur
fc90638b2b Code comment 2019-10-07 10:42:18 +02:00
Laurent Destailleur
b85c4f0864 Merge branch 'develop' into new-import-product-country-code 2019-10-07 10:41:35 +02:00
Laurent Destailleur
c3ae87816f Merge pull request #12049 from frederic34/holidayz 
lang file for holidays is holiday
 2019-10-07 10:21:36 +02:00