lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
66,532 Commits 43 Branches 150 Tags 886 MiB
6ced1a3264
Commit Graph

58016 Commits

Author SHA1 Message Date
Marc de Lima Lucio
e88830820a FIX: dont print empty date in CommonObject::showOutputField 2018-04-18 11:13:18 +02:00
Regis Houssin
a4cd087df0 Fix: some bugs 2018-04-18 10:30:03 +02:00
Regis Houssin
ff76e60c49 Fix: some bugs and warnings 2018-04-18 10:13:20 +02:00
Regis Houssin
d6680b982a Fix: file not physically removed 2018-04-18 09:42:29 +02:00
Regis Houssin
d841abd55a Fix: missing value when reload 2018-04-18 09:37:29 +02:00
Regis Houssin
85c93c26a9 Fix: dolibarrize 2018-04-18 09:27:54 +02:00
Regis Houssin
eaecf7190a Fix: avoid Warning: A non-numeric value encountered + wrong var name 2018-04-18 08:34:48 +02:00
Alexandre SPANGARO
fd7bc2e607 Accountancy - move to loadLangs 2018-04-18 06:20:34 +02:00
Laurent Destailleur
7256edc831 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-18 03:28:50 +02:00
Laurent Destailleur
bbfc4a3e17 NEW Look and feel v8 - Show Picto "+" on all links "Add record" 2018-04-18 03:26:15 +02:00
Laurent Destailleur
46d28acb44 Look and feel v8 2018-04-18 02:10:23 +02:00
Laurent Destailleur
b39755f7b9 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-18 00:16:14 +02:00
Laurent Destailleur
013f95f54b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-18 00:02:51 +02:00
Laurent Destailleur
e4635c9401 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-18 00:01:40 +02:00
Laurent Destailleur
963c5c2951 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-18 00:01:13 +02:00
Laurent Destailleur
c7789d2038 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-18 00:01:06 +02:00
Laurent Destailleur
a0f8aa50d5 CSS 2018-04-18 00:00:37 +02:00
Laurent Destailleur
5713a048fe
Merge pull request #8632 from aspangaro/8.0-a21 
Fix Accountancy
 2018-04-17 21:30:16 +02:00
Laurent Destailleur
d2d28ac851
Merge pull request #8629 from hregis/develop_pgsql 
Fix: correct syntax for postgresql
 2018-04-17 21:28:07 +02:00
Regis Houssin
ad197d01c1 Fix: avoid error 2018-04-17 21:16:17 +02:00
Regis Houssin
bab32e05e7 Fix: best practice for sequence 2018-04-17 21:08:40 +02:00
Laurent Destailleur
c551bf20e2 sys 2018-04-17 21:06:26 +02:00
Alexandre SPANGARO
e0c0f7fd9b Fix Accountancy 2018-04-17 20:04:55 +02:00
Regis Houssin
c07b5d684c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_pgsql 2018-04-17 19:37:38 +02:00
Laurent Destailleur
5f3de7f97e Doc 2018-04-17 19:23:05 +02:00
Regis Houssin
955ff14c6f Fix: correct syntax for postgresql 2018-04-17 19:06:14 +02:00
Laurent Destailleur
dd46d97138
Merge pull request #8628 from hregis/develop_multicompany 
Fix: syntax error with postgresql
 2018-04-17 18:55:46 +02:00
Laurent Destailleur
11897976c3
Merge pull request #8625 from hregis/6.0_multicompany 
Fix: missing drop index with postgresql
 2018-04-17 18:52:45 +02:00
Laurent Destailleur
fb81ce5117 Some fixes for postgresl migration 2018-04-17 18:32:04 +02:00
Regis Houssin
6d7bd7ce1e Fix: syntax error with postgresql 2018-04-17 18:26:37 +02:00
Regis Houssin
9a210c1a91 Fix: syntax error for postgresql > 9.1 2018-04-17 17:33:40 +02:00
Regis Houssin
d89086cb7a Fix: missing drop constraint with postgresql 2018-04-17 17:25:54 +02:00
Regis Houssin
dd835c4868 Fix: missing drop index with postgresql 2018-04-17 17:18:59 +02:00
Laurent Destailleur
e7281238a9 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-17 16:17:25 +02:00
Laurent Destailleur
eb3b351e83 Transifex sync 2018-04-17 16:17:07 +02:00
Laurent Destailleur
fee4966219
Merge pull request #8601 from frederic34/esign 
NEW add optional esign field in pdf propal
 2018-04-17 16:12:53 +02:00
Laurent Destailleur
bf4daa4752
Merge pull request #8622 from frederic34/contratlist 
NEW display total on contract service list
 2018-04-17 16:08:26 +02:00
Inovea Conseil
d032280a96
NEW add any predefined mail content 2018-04-17 16:03:12 +02:00
Frédéric FRANCE
aec601dbcc
display total on contract service list 2018-04-17 15:40:12 +02:00
Laurent Destailleur
89a6841fbc Debug ticket module 2018-04-17 14:51:08 +02:00
Laurent Destailleur
8c23fe6764 Fix td 2018-04-17 14:49:21 +02:00
Laurent Destailleur
2135365e0a Bug new extrafields architecture 2018-04-17 14:44:55 +02:00
Laurent Destailleur
89b5114882 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-17 14:34:37 +02:00
Laurent Destailleur
4dadfac74b Debug usage of the new extrafield architecture 2018-04-17 14:34:17 +02:00
Laurent Destailleur
7bb8078b46 Fix translation of extrafields 2018-04-17 13:52:50 +02:00
Laurent Destailleur
7b53ec5198 FIX timestamp must be an int not a float 2018-04-17 12:41:13 +02:00
Juanjo Menent
9ae28d2bc2 Fix: zip not filter 2018-04-17 10:43:25 +02:00
ptibogxiv
3acd1b536b
Update stripe.php 2018-04-17 10:15:14 +02:00
ptibogxiv
8db9d19521
ADD minimal amount to require 3Dsecure if it's possible 2018-04-17 10:14:36 +02:00
Laurent Destailleur
d2f0d1f613 Add option MAIN_SEARCHBOX_CONTENT_LOADED_BEFORE_KEY because it is hard 
to understand how it works when list is preloaded.
 2018-04-17 10:01:14 +02:00
Laurent Destailleur
72c3a60d24 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-17 09:46:11 +02:00
Laurent Destailleur
80ece31631
Merge pull request #8607 from ATM-Marc/FIX_leftmenu_search 
FIX: left search form: directly display all qualified objects
 2018-04-17 09:45:55 +02:00
Laurent Destailleur
c3970f1a52 Code comment 2018-04-17 09:44:57 +02:00
Laurent Destailleur
7b3a9de9db
Merge pull request #8603 from frederic34/logintransp 
login transparent when using background
 2018-04-17 09:35:47 +02:00
Laurent Destailleur
f06412ebc1
Update style.css.php 2018-04-17 09:35:25 +02:00
Laurent Destailleur
1e0a660d24 More font awesome picto instead of img 2018-04-16 19:57:46 +02:00
Laurent Destailleur
106fb87d0a NEW Can sort order of files in attach tab for leave and expensereport 2018-04-16 19:25:27 +02:00
Laurent Destailleur
faea6861c3 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/invoicetemplate_list.php
	htdocs/langs/en_US/bills.lang
 2018-04-16 18:19:21 +02:00
Laurent Destailleur
f19abe38d7 FIX pdf thumb for expense report 2018-04-16 18:17:35 +02:00
Laurent Destailleur
27a8476117 FIX remove var_dump 2018-04-16 17:02:54 +02:00
Marc de Lima Lucio
ba50fcd130 FIX: left search form: directly display all qualified objects 2018-04-16 15:15:35 +02:00
Laurent Destailleur
622042e9b2 FIX Max nb of generation of recurring invoice should not show warning 2018-04-16 15:05:35 +02:00
Laurent Destailleur
50d86a7cfd Fix accounting area when advanced accounting module not enabled 2018-04-16 14:25:39 +02:00
Laurent Destailleur
f1ad3912e7 Fix multicompany compatibility for recurring invoice generation 2018-04-16 14:18:38 +02:00
Laurent Destailleur
14ed19265c FIX environment shown on cron card 2018-04-16 13:53:59 +02:00
Laurent Destailleur
0d0da234b1 Lowercase NULL, TRUE, FALSE according to PSR2 2018-04-16 13:51:16 +02:00
Laurent Destailleur
c702c88fde CSS 2018-04-16 13:11:48 +02:00
Laurent Destailleur
e7f6785a53 Add log 2018-04-16 12:23:24 +02:00
Laurent Destailleur
0d26bdcdc5 FIX Button receive products not visible 2018-04-16 11:20:29 +02:00
Laurent Destailleur
d549090290 Fix translation of button action must be a verb 2018-04-16 11:12:56 +02:00
atm-greg
90f1ab8af4 add hooks on supplier documents 2018-04-16 06:46:22 +02:00
Laurent Destailleur
8c307987d8 css 2018-04-16 00:26:13 +02:00
Laurent Destailleur
69c26e19a8 NEW Can edit the text color for title line of tables 2018-04-15 22:01:52 +02:00
Laurent Destailleur
72de21537c Clean code 2018-04-15 20:09:09 +02:00
Laurent Destailleur
6450f95c90 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-15 19:13:38 +02:00
Laurent Destailleur
2959dc4a3a Fix regression 2018-04-15 18:20:04 +02:00
Laurent Destailleur
e2838aa074 NEW Show also size in bytes in tooltip if visible unit is not bytes 2018-04-15 17:58:13 +02:00
Laurent Destailleur
8fbde88872 Look and feel v8 2018-04-15 17:37:49 +02:00
Laurent Destailleur
9e50bbb9b1 standardize code 2018-04-15 16:35:18 +02:00
Frédéric FRANCE
46cfe1e2e7
Merge remote-tracking branch 'upstream/develop' into esign 2018-04-15 14:33:03 +02:00
Frédéric FRANCE
dec774ccf5
login transparent when using background 2018-04-15 14:03:05 +02:00
Laurent Destailleur
57c03553dd Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2018-04-15 12:09:07 +02:00
Laurent Destailleur
9ae789b358 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-15 11:42:12 +02:00
Laurent Destailleur
13ba69e085
Merge pull request #8595 from hregis/develop_ldap 
Fix: broken $pdf object !
 2018-04-15 11:38:51 +02:00
Laurent Destailleur
da66e5c5a7
Update pdf.lib.php 2018-04-15 11:38:29 +02:00
Frédéric FRANCE
d4c03230a0
add optional esign field in pdf propal 2018-04-15 11:34:21 +02:00
Laurent Destailleur
64dafbc37f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-15 11:33:40 +02:00
Laurent Destailleur
37e4da30d0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-15 11:33:27 +02:00
Laurent Destailleur
daf63ca116 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-15 11:32:06 +02:00
Laurent Destailleur
5968ca8cf2
Merge pull request #8593 from frederic34/patch-2 
Translation
 2018-04-15 11:31:21 +02:00
Laurent Destailleur
e49e455c0c
Merge pull request #8598 from aspangaro/8.0-a19 
Accountancy - list by account - Add some fix & functions
 2018-04-15 11:31:01 +02:00
Laurent Destailleur
90b5adaef1
Merge pull request #8600 from aspangaro/8.0-a20 
Fix export balance
 2018-04-15 11:28:22 +02:00
Laurent Destailleur
514b1116b7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-15 11:28:05 +02:00
Laurent Destailleur
f9382ce395 Upgrade octicons 2018-04-15 11:27:39 +02:00
Laurent Destailleur
dbfee8117d
Merge pull request #8597 from atm-florian/dev_uniformcode 
fix syntax and uniformize code
 2018-04-15 11:26:18 +02:00
Alexandre SPANGARO
910d83d6e3 Fix export balance 2018-04-15 07:49:54 +02:00
Philippe GRAND
0a6bcb2a39 fix typo and translation 2018-04-15 07:37:23 +02:00
Philippe GRAND
7943a19402 fix typo 2018-04-15 07:07:04 +02:00
Alexandre SPANGARO
899ef6d2a6 Accountancy - list by account - Add some fix & functions 2018-04-15 06:55:18 +02:00
Laurent Destailleur
db385d64b6 Fix br 2018-04-14 23:24:01 +02:00