2
0
forked from Wavyzz/dolibarr
Commit Graph

69068 Commits

Author SHA1 Message Date
Laurent Destailleur
eb03fb7540 Fix trad/compatibility 2018-03-19 15:00:50 +01:00
Laurent Destailleur
ac9ab7b228 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-19 14:10:17 +01:00
Laurent Destailleur
8889e7f4b2 FIX translation of holiday types 2018-03-19 14:09:44 +01:00
Laurent Destailleur
7272ee806e Fix field not mandatory 2018-03-19 12:55:13 +01:00
Laurent Destailleur
ae17ce6f9a NEW Add a tab to specify accountant/auditor of the company 2018-03-19 12:52:09 +01:00
Laurent Destailleur
91b3ffc3da Merge pull request #8409 from aspangaro/8.0-a10
NEW Add a tab to specify accountant/auditor of the company
2018-03-19 12:40:44 +01:00
Laurent Destailleur
13801a0d93 Merge pull request #8417 from hregis/7.0_bug3
Fix: replace ldaps:// by ssl://
2018-03-19 12:38:14 +01:00
Laurent Destailleur
eb7886ecff Update ldap.class.php 2018-03-19 12:37:53 +01:00
Laurent Destailleur
1837d6a5f3 Better look of lines 2018-03-19 12:30:48 +01:00
Laurent Destailleur
76a7cc0d5c Merge pull request #8299 from aspangaro/8.0-a7
NEW On invoice card, show accounting account linked
2018-03-19 12:19:46 +01:00
Laurent Destailleur
12068f9cf3 Merge branch 'develop' into 8.0-a7 2018-03-19 12:18:18 +01:00
Laurent Destailleur
2ae1bb26c5 Update compta.lang 2018-03-19 12:14:43 +01:00
Laurent Destailleur
c3cd2ff3db Update objectline_view.tpl.php 2018-03-19 12:13:18 +01:00
Regis Houssin
890d0b6685 Fix: replace ldaps:// by ssl:// 2018-03-19 12:11:59 +01:00
Laurent Destailleur
6f7098d22e Update objectline_view.tpl.php 2018-03-19 12:09:38 +01:00
Laurent Destailleur
928d428956 Merge pull request #8412 from atm-florian/dev_scrunit
fix scrutinizer
2018-03-19 12:08:14 +01:00
Laurent Destailleur
5a98958280 Update adherent.class.php 2018-03-19 12:07:08 +01:00
Laurent Destailleur
ce3975377d Link to unlink is unlink and not remove 2018-03-19 12:02:49 +01:00
Laurent Destailleur
e91ffa00eb NEW Can crop image files attached in "document" tabs of a member 2018-03-19 11:56:04 +01:00
Laurent Destailleur
f46df6d8e5 Can resize and crop images in the ticketsup module 2018-03-19 11:49:05 +01:00
Laurent Destailleur
f8ca4b1b5c NEW Add option BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD 2018-03-19 11:34:48 +01:00
Laurent Destailleur
0013e9d83b FIX Make a redirect after the remove_file action to avoid deletion done
at next action too.
2018-03-19 11:29:36 +01:00
Laurent Destailleur
5db718448f Delete at end 2018-03-19 11:29:06 +01:00
Laurent Destailleur
8899b511fd FIX Make a redirect after the remove_file action to avoid deletion done
at next action too.
2018-03-19 11:28:55 +01:00
Laurent Destailleur
6ca40bcbd4 Fix translation 2018-03-19 11:01:44 +01:00
Laurent Destailleur
9aa4a90543 NEW Stripe online payments reuse the same stripe customer account 2018-03-19 10:57:19 +01:00
Laurent Destailleur
8e72ddc89b FIX missing email of customer in stripe info payments 2018-03-19 10:18:03 +01:00
florian HENRY
9c58bfafdd Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_scrunit 2018-03-19 08:37:50 +01:00
Laurent Destailleur
39228f6221 South africa vat rates 2018-03-18 23:37:46 +01:00
Laurent Destailleur
8223047d4a South africa vat rates 2018-03-18 23:37:28 +01:00
Laurent Destailleur
6a6cf956b1 FIX update of nb of period of loan 2018-03-18 23:32:06 +01:00
Laurent Destailleur
7e488c7ccd Trans 2018-03-18 22:11:30 +01:00
Laurent Destailleur
9c221c10aa Load trans 2018-03-18 21:04:16 +01:00
Laurent Destailleur
8e50e63243 Fix translation 2018-03-18 20:32:18 +01:00
Laurent Destailleur
e55c90b015 Fix translation 2018-03-18 20:29:36 +01:00
Laurent Destailleur
99ac06b0b8 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-18 20:22:22 +01:00
Laurent Destailleur
b4881645d8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/core/lib/functions.lib.php
2018-03-18 20:21:59 +01:00
Laurent Destailleur
1bb4f3e07a Dolibarrize module ticket 2018-03-18 20:20:10 +01:00
Laurent Destailleur
af44af0235 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-18 20:01:27 +01:00
Laurent Destailleur
51b6723b08 Dolibarrize module ticket 2018-03-18 20:01:11 +01:00
Laurent Destailleur
d4ae0395ed NEW Look and feel v8: Use a different picto for delete and unlink 2018-03-18 19:13:42 +01:00
Laurent Destailleur
09beb9186e Merge pull request #8403 from atm-maxime/develop
New filter on product supplier price import update
2018-03-18 14:18:20 +01:00
Laurent Destailleur
f371f80de3 Merge pull request #8400 from atm-arnaud/6.0_fix_societe_banner_status
FIX show status on societe banner
2018-03-18 12:46:19 +01:00
Laurent Destailleur
0dd33440d1 Merge pull request #8397 from hregis/7.0_bug3
Fix: missing update of $conf
2018-03-18 12:29:58 +01:00
Laurent Destailleur
0c1e0f38d8 Merge pull request #8404 from OPEN-DSI/project_add_close_to_mass_update
NEW Add mass action on project's list to close projects
2018-03-18 12:28:03 +01:00
Laurent Destailleur
6861dab49e Merge pull request #8401 from all3kcis/patch-6
Add batch status
2018-03-18 12:22:34 +01:00
Laurent Destailleur
22210446da Merge pull request #8407 from joseplluis/develop
FIX: add contact permission on contact box
2018-03-18 12:19:09 +01:00
Laurent Destailleur
e3c0fcc3a0 Merge pull request #8405 from grandoc/develop
New [*use loadLangs for translation files*]
2018-03-18 12:17:13 +01:00
Josep Lluís
b2a4e3d023 Error in fix 2018-03-18 08:20:43 +01:00
Alexandre SPANGARO
17b98b84ad Merge remote-tracking branch 'uptream/develop' into 8.0-a10 2018-03-18 06:11:05 +01:00