lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
56,090 Commits 43 Branches 150 Tags 886 MiB
70e5d29b28
Commit Graph

56090 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
70e5d29b28 Fix group by 2016-10-17 10:37:29 +02:00
Laurent Destailleur
4cf4090cde Css 2016-10-17 00:21:39 +02:00
Laurent Destailleur
2592b4cba4 Fix field required only faor cheque payment mode 2016-10-16 21:39:19 +02:00
Laurent Destailleur
912ac8e3d6 Fix css 2016-10-16 21:29:12 +02:00
Laurent Destailleur
15a7262328 Fix pb with multicurrency 2016-10-16 20:33:17 +02:00
Laurent Destailleur
28933c31dd Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/projet/card.php
 2016-10-16 19:04:33 +02:00
Laurent Destailleur
2db38b4bcc Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/societe/list.php
 2016-10-16 19:02:36 +02:00
Laurent Destailleur
ab34885a89 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-10-16 18:34:31 +02:00
Laurent Destailleur
3d1ddbb923 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-10-16 18:34:20 +02:00
Laurent Destailleur
fe471c43d1 Minor css enhancement 2016-10-16 18:28:09 +02:00
Laurent Destailleur
8edb51a017 FIX Extra fields of task not copied on project cloning 2016-10-16 18:27:39 +02:00
Laurent Destailleur
9175ff80a0 Fix download of files uploaded on donation 2016-10-16 17:25:33 +02:00
Laurent Destailleur
274d2a9d1f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-16 12:12:57 +02:00
Laurent Destailleur
ee1ee1eee7 Management of the "Copy of" when cloning projects. 2016-10-16 12:12:45 +02:00
Laurent Destailleur
4c58793587 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-10-16 11:42:57 +02:00
Laurent Destailleur
2695f35284 Fix to avoid scroll on confirm popup 2016-10-16 11:40:10 +02:00
Juanjo Menent
f9a5074f2d Merge pull request #5879 from aspangaro/4.0-p3 
Fix: Some problems with loan module
 2016-10-16 10:37:39 +02:00
aspangaro
9ab0bfe905 Fix: Add another key for bank rather than to modify one 2016-10-16 06:50:13 +02:00
Juanjo Menent
ced51c24c7 Merge pull request #5878 from aspangaro/5.0-p21 
Fix: Missing td in list of bank account.
 2016-10-15 17:41:46 +02:00
Juanjo Menent
87e8ac51be Merge pull request #5843 from simnandez/3.8 
FIX: Error when CATEGORIE_RECURSIV_ADD is enabled and new category is daughter of an already linked to object
 2016-10-15 17:18:35 +02:00
Laurent Destailleur
30e6dd93a6 Missing perf key on the most important table 2016-10-15 17:10:05 +02:00
Laurent Destailleur
6601c9ef1b Sync transifex 2016-10-15 16:51:02 +02:00
Laurent Destailleur
9cad437d5c Fix list in chart of account 2016-10-15 16:20:08 +02:00
Laurent Destailleur
170a2e9889 Fix menu 2016-10-15 15:54:58 +02:00
Laurent Destailleur
04c0e87d79 Work on accounting module 2016-10-15 15:51:28 +02:00
Laurent Destailleur
c689248211 The setup that must be done by the bookkeeper is removed from admin 
setup and move into setup of accountancy
 2016-10-15 14:38:43 +02:00
aspangaro
df581d8973 Fix: In payment card, only the capital is considered as a payment, interest and insurance are tax 2016-10-15 08:07:01 +02:00
aspangaro
25ba5074a7 Fix: Problem of presentation 2016-10-15 08:00:31 +02:00
aspangaro
1beaf003f0 Fix #5875: Links to loans are incorrect in the bank account transactions tab 2016-10-15 07:45:10 +02:00
aspangaro
380ab8bfa5 Fix: Show Ref/rowid of loan 2016-10-15 07:05:53 +02:00
aspangaro
49e2b1ffdb Fix: Error with language key 2016-10-15 06:56:38 +02:00
aspangaro
849e46ab1d Merge remote-tracking branch 'Upstream/develop' into 5.0-p21 2016-10-15 05:59:11 +02:00
aspangaro
38c75ffeb0 Fix: Missing td in list of bank account. 2016-10-15 05:57:10 +02:00
Laurent Destailleur
48ce299a38 NEW Option MAIN_INFO_SOCIETE_MAIL_ALIASES to use different identities. 2016-10-15 03:45:23 +02:00
Laurent Destailleur
dfbca2d0ad Merge pull request #5868 from olsesacl/#5830 
NEW: #5830 Allow Generic E-mail Sender
 2016-10-15 02:43:19 +02:00
Laurent Destailleur
ac60dfa883 Merge pull request #5873 from olsesacl/facture_list_sql_mode 
FIX: Error show list invoice when sql_mode=only_full_group_by
 2016-10-15 02:22:20 +02:00
Laurent Destailleur
6aeed34d30 Merge pull request #5871 from atm-florian/dev_clonecontract 
NEW Add clone contract feature
 2016-10-15 02:21:35 +02:00
Laurent Destailleur
c4929c76f2 Merge pull request #5859 from GPCsolutions/5858 
Fix module activation errors
 2016-10-15 02:20:49 +02:00
Laurent Destailleur
b51b6fa8c8 Merge pull request #5865 from atm-florian/develop 
NEW : Export thirdparty with payement terms and mode
 2016-10-15 02:18:07 +02:00
Laurent Destailleur
cec792f142 Merge pull request #5867 from aspangaro/4.0-p2 
Fix: Missing language key
 2016-10-15 02:16:14 +02:00
Laurent Destailleur
dda248cb57 Merge pull request #5870 from olsesacl/#5340 
FIX: #5340 Importing Tiers problem with capital field
 2016-10-15 02:16:00 +02:00
Laurent Destailleur
4fb66cf7a4 Better explanation for ftp module setup to avoid error with FTPS/SFTP. 2016-10-15 02:11:49 +02:00
Laurent Destailleur
850a275b47 Fix duplicate accounting account with same number. Add unique key. 2016-10-14 18:46:30 +02:00
Laurent Destailleur
1f6ddb485f Fix missing module supplier proposal for external users 2016-10-14 18:22:07 +02:00
Laurent Destailleur
d27dea8320 NEW Can rename uploaded or generated files on all "documents" tabs. 2016-10-14 18:09:24 +02:00
Laurent Destailleur
5e00fb8fc7 Fix sepa mandate translation 2016-10-14 17:56:22 +02:00
Laurent Destailleur
78182ab504 Fix sepa mandate translation 2016-10-14 17:47:05 +02:00
Laurent Destailleur
a54a610a05 Uniformize code 2016-10-14 17:44:41 +02:00
Laurent Destailleur
a7c6ecc177 Fix better compatibility with multicompany 2016-10-14 16:05:25 +02:00
Laurent Destailleur
e74718827f Debug accountancy module 2016-10-14 15:44:33 +02:00