Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
79,692 Commits 36 Branches 189 Tags
7b1b51e752fc285850cae897637ed1a85421c660
Commit Graph

4351 Commits

Author SHA1 Message Date
Laurent Destailleur
4941a99cc7 Merge pull request #12126 from grandoc/new_branch_14_10_2019 
add missing translation
 2019-10-14 20:53:28 +02:00
Laurent Destailleur
5a55997540 Update pdf_eratosthene.modules.php 2019-10-14 20:53:18 +02:00
Laurent Destailleur
5c4edad0d4 Merge pull request #12105 from grandoc/new_branch_12_10_2019 
more internationalization
 2019-10-14 20:37:50 +02:00
Philippe GRAND
fd90ebe63b add missing translation 2019-10-14 15:57:29 +02:00
Philippe GRAND
e326c23245 add missing translation 2019-10-14 15:48:24 +02:00
Laurent Destailleur
a33fb47777 Work on MO module 2019-10-14 12:10:14 +02:00
Philippe GRAND
33efd77fc7 more internationalization 2019-10-12 12:10:33 +02:00
Frédéric FRANCE
9f59656589 fix typo inspired by grandoc 2019-10-11 23:08:33 +02:00
Laurent Destailleur
f334180cb8 Merge pull request #12072 from OPEN-DSI/new-categorie-import-parent 
NEW add parent category id or label in import category module
 2019-10-11 17:33:28 +02:00
Laurent Destailleur
fa928f7dc3 Update modCategorie.class.php 2019-10-11 17:33:13 +02:00
Laurent Destailleur
a0f918c85a Merge pull request #12094 from grandoc/new_branch_11_10_2019 
fix some translations
 2019-10-11 16:21:06 +02:00
VESSILLER
2fb776ee34 NEW add new rule fetchidfromcodeandlabel for categories import 2019-10-11 11:57:11 +02:00
Philippe GRAND
25b9be9de7 update code 2019-10-11 10:19:58 +02:00
Frédéric FRANCE
9a2fabff6f doxygen 2019-10-10 18:42:29 +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
VESSILLER
d77f7556d8 NEW add parent category id or label in import category module 2019-10-09 16:00:14 +02:00
Laurent Destailleur
9f4aadae18 Missing Nature, Duration and Type fields in export of products 2019-10-09 02:05:20 +02: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
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 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
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
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
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
Laurent Destailleur
12d243b8d4 FIX #12040 2019-10-07 13:13:46 +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
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
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Frédéric FRANCE
8a9f08d5a3 lang file for holidays is holiday 2019-10-06 11:29:24 +02:00
Laurent Destailleur
b883a8092a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/product.lib.php
	htdocs/core/tpl/extrafields_list_search_input.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/product/class/html.formproduct.class.php
 2019-10-05 19:35:40 +02:00
VESSILLER
0e23fbc6df NEW add country code in import product model 2019-10-04 10:04:02 +02:00
Sebastien Baguet
9daffcbe07 Fix for no subscription members 2019-10-03 00:29:41 +02:00
Alexandre SPANGARO
848acb6096 Update index 2019-10-02 08:49:33 +02:00
Alexandre SPANGARO
a6e429ff32 Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal 2019-10-02 08:49:00 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Alexandre SPANGARO
8dea427f58 Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal 2019-09-30 21:23:27 +02:00
Laurent Destailleur
0846a081cb Merge branch 'develop' into new_branch_29_06_2019 2019-09-30 21:06:51 +02:00