Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,072 Commits 35 Branches 179 Tags 1.7 GiB
afee39ea68
Commit Graph

8469 Commits

Author SHA1 Message Date
Philippe GRAND
8bee69277d Standardize and update code 2018-10-04 09:33:30 +02:00
aplose
8ee7a48583 Fix issue #9434 : no array_options available when calling api : 
I replace the deprecated code by the fetch_optionnals() recommanded call.
 2018-10-03 15:15:46 +02:00
John BOTELLA
af66a8971a NEW Hidden conf INVOICE_USE_DEFAULT_DOCUMENT 2018-10-02 15:51:17 +02:00
Laurent Destailleur
ae62204a79
Merge pull request #9628 from grandoc/new_branch_28_09_2018 
Standardize and update code
 2018-10-01 01:04:36 +02:00
Laurent Destailleur
adc36e7d63 Clean code 2018-10-01 00:20:47 +02:00
Laurent Destailleur
2f88f84e3b Clean code 2018-09-28 22:13:42 +02:00
Laurent Destailleur
e2f450aa8c Fix regession losing description. 
Rename updateligne into updateline.
 2018-09-28 16:15:17 +02:00
Philippe GRAND
15ff9f8917 Standardize and update code 2018-09-28 14:44:47 +02:00
Laurent Destailleur
118ff2d8d0 phpcs 2018-09-28 10:42:42 +02:00
Laurent Destailleur
a88dcfd1e4 Fix phpcs 2018-09-28 02:24:11 +02:00
Laurent Destailleur
e252a5f046 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-27 12:55:45 +02:00
Laurent Destailleur
62b31df069 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/rssparser.class.php
	htdocs/langs/en_US/boxes.lang
 2018-09-27 12:55:25 +02:00
Laurent Destailleur
26d20d0b76
Merge pull request #8729 from atm-quentin/NEW_rights_ignoring_min_price 
NEW Advanced permission to ignore price min
 2018-09-27 09:57:49 +02:00
Laurent Destailleur
ee8b5030a0
Merge pull request #9610 from atm-john/FIX_situation_credit_note 
Fix situation credit note
 2018-09-27 09:26:23 +02:00
Laurent Destailleur
e3b1cb9fdb
Update facture.class.php 2018-09-27 09:25:37 +02:00
Philippe GRAND
746d73b8e6 Add some code comment 2018-09-25 17:26:57 +02:00
John BOTELLA
022f842cb0 Fix display good progress for new situation invoices 2018-09-25 10:28:47 +02:00
John BOTELLA
791c373db5 FIX credit note progression 2018-09-25 09:54:58 +02:00
Laurent Destailleur
b93ab79679 FIX Error messages 2018-09-25 00:39:28 +02:00
John BOTELLA
b1380a6902 FIX situation invoice total with credit note 2018-09-24 16:12:00 +02:00
Laurent Destailleur
ad6895aa2e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-24 10:23:09 +02:00
Laurent Destailleur
57e359cd40 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/agenda.lang
 2018-09-24 10:18:13 +02:00
Laurent Destailleur
dbb75e35a1 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/agenda.lang
 2018-09-24 10:14:38 +02:00
Laurent Destailleur
f88170e22a
Merge pull request #9596 from tuxgasy/dev_bank_treso_hooks 
NEW Add somes hooks in bank planned entries
 2018-09-23 15:49:50 +02:00
TuxGasy
db223af39b Add somes hooks in bank planned entries 2018-09-22 18:44:00 +02:00
Philippe Grand
239be3b58c
Merge branch 'develop' into new_branch_20_09_2018 2018-09-21 10:12:48 +02:00
Laurent Destailleur
b05954fb1e
Merge pull request #9061 from delcroip/comptafiles 
NEW: Page to check if the operations/itemw created between two dates have attached item(s) and possibility to download all attachements
 2018-09-20 19:45:46 +02:00
Philippe GRAND
803505b6b7 Standardize and update code 2018-09-20 12:27:06 +02:00
Frédéric FRANCE
126e5ae3ad
remove not needed require 2018-09-18 20:05:48 +02:00
Frédéric FRANCE
032f9729a5
correct trimParameters 2018-09-18 19:05:00 +02:00
Laurent Destailleur
61f5a2e899
Merge pull request #9533 from frederic34/trimParameters 
trimParameters function
 2018-09-18 15:04:32 +02:00
Laurent Destailleur
e65ec9f4ef
Merge pull request #9530 from frederic34/patch-15 
reduce complexity of cchargesociales class
 2018-09-18 15:02:44 +02:00
Laurent Destailleur
e6791e1763
Merge pull request #9526 from frederic34/patch-10 
completely comment unused code
 2018-09-18 14:59:55 +02:00
Philippe GRAND
a1b15f170e Standardize and update code 2018-09-17 09:00:23 +02:00
Frédéric FRANCE
f935701d30
trimParameters 2018-09-16 15:35:19 +02:00
Frédéric FRANCE
b950043618
trimParameters 2018-09-16 15:16:08 +02:00
Frédéric FRANCE
367e202df0
reduce complexity of cchargesociales class 2018-09-16 13:54:17 +02:00
Laurent Destailleur
ab0f842db6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-16 12:55:44 +02:00
Laurent Destailleur
74a9c680df FIX "Other ..." link so the "Back to" link works. 2018-09-16 12:27:56 +02:00
Laurent Destailleur
f7c2bd877a Comment dead code 2018-09-16 10:39:30 +02:00
Laurent Destailleur
d6ee00f2e7 Fix constructors does not need return value 2018-09-16 10:22:23 +02:00
Frédéric FRANCE
7b3b020533
completely comment unused code 2018-09-16 09:41:38 +02:00
Laurent Destailleur
5eff159e27
Merge pull request #9489 from frederic34/patch-9 
Completely comment unused code
 2018-09-15 16:59:49 +02:00
Laurent Destailleur
961505d510 NEW Add filter on staff range in list of thirdparties 2018-09-14 01:29:03 +02:00
Frédéric FRANCE
a128ea821e
Completely comment unused code 2018-09-12 22:49:32 +02:00
Frédéric FRANCE
987fdbe73c
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 21:29:41 +02:00
Frédéric FRANCE
ce76a2e714
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-12 20:21:35 +02:00
Laurent Destailleur
82580cadf6
Merge pull request #9458 from frederic34/patch-17 
Update account.class.php
 2018-09-12 19:07:19 +02:00
Frédéric FRANCE
3e71f4e6b0
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 18:36:49 +02:00
Frédéric FRANCE
998b67fa98
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-12 18:32:15 +02:00
Laurent Destailleur
de8496773d
Merge pull request #9441 from grandoc/new_branch_09_09_2018 
New branch 09 09 2018
 2018-09-12 18:24:34 +02:00
Laurent Destailleur
6291f18179
Merge pull request #9440 from frederic34/patch-5 
Upper Lower Casing
 2018-09-12 18:24:02 +02:00
Laurent Destailleur
3662ebe3a3 Fix syntax error 2018-09-12 18:05:20 +02:00
Laurent Destailleur
fcabe67e4b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-12 13:30:28 +02:00
Maxime Kohlhaas
c94689e9a9 FIX remain to pay for credit note was wrong on invoice list 2018-09-12 11:53:57 +02:00
Laurent Destailleur
aad6a0871f FIX Lose filter on payment type or category after a sort on invoice list 
Conflicts:
	htdocs/compta/facture/list.php
 2018-09-12 10:59:53 +02:00
Laurent Destailleur
7bea9f5ffb FIX Lose filter on payment type or category after a sort on invoice list 2018-09-12 10:57:09 +02:00
delcroix Patrick
2a4c65726c
new: delete zip after download 
and correct date 2.0
 2018-09-11 22:14:58 +02:00
delcroix Patrick
e36bc24dee
fix:copyrights 2018-09-11 21:55:05 +02:00
delcroix Patrick
e3920edb79
correct for invoice supplier links 2018-09-11 21:53:47 +02:00
Frédéric FRANCE
cdc5a174aa
Update account.class.php 2018-09-11 00:29:01 +02:00
Frédéric FRANCE
7e0b1055db
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-09 13:36:53 +02:00
Frédéric FRANCE
f02b2f0239
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-09 13:35:58 +02:00
Philippe GRAND
b40fe8e4c9 Standardize and update code 2018-09-09 12:07:14 +02:00
Frédéric FRANCE
a558c3bdac
replace select_date 2018-09-09 11:25:59 +02:00
Philippe GRAND
7fcbd0fe42 Standardize and update code 2018-09-09 11:10:32 +02:00
Frédéric FRANCE
c2ad09cc0e
replace select_date 2018-09-09 10:11:27 +02:00
Frédéric FRANCE
b2a58067d9
replace select_date 2018-09-09 09:56:33 +02:00
Frédéric FRANCE
a3fa13994b
replace select_date 2018-09-09 09:36:12 +02:00
Frédéric FRANCE
ee8d56e047
Update card.php 2018-09-08 23:18:38 +02:00
Frédéric FRANCE
ef2ee8a6e4
Update card.php 2018-09-08 23:17:29 +02:00
Laurent Destailleur
84bbe8684b Fix scrutinizer 2018-09-08 18:38:24 +02:00
Frédéric FRANCE
80880d8fb9
replace select_date by selectDate 2018-09-08 13:00:39 +02:00
Frédéric FRANCE
2b62c4ca8f
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-08 10:50:27 +02:00
Laurent Destailleur
bcfb5fc42e
Merge pull request #9425 from atm-maxime/8.0 
FIX : Homepage links were using wrong topmenus
 2018-09-07 19:35:10 +02:00
Laurent Destailleur
0ef17fe581 FIX Problems with permissions of module to record payment of salaries 2018-09-07 13:32:56 +02:00
Maxime Kohlhaas
a5f4a74ecc FIX : Homepage links were using wrong topmenus 2018-09-06 14:49:48 +02:00
Philippe GRAND
9025fd5891 Merge branch '8.0' of https://github.com/Dolibarr/dolibarr into 8.0 2018-09-06 14:33:46 +02:00
Philippe GRAND
844333688b typo 2018-09-06 14:33:22 +02:00
Frédéric FRANCE
4e619dd0ed
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-05 18:51:21 +02:00
Philippe GRAND
056b0b26cc fix : Public member variable _fetched must not be prefixed with an underscore 2018-09-05 15:39:04 +02:00
Philippe GRAND
38ca6096b2 Standardize and update code 2018-09-05 10:31:12 +02:00
Frédéric FRANCE
7799774ca1
move phpcs:ignore 2018-09-04 22:52:55 +02:00
Laurent Destailleur
ab8155f170 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php
 2018-09-04 21:35:43 +02:00
Frédéric FRANCE
65b74ad30f
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 20:48:35 +02:00
Frédéric FRANCE
bdcac95761
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 15:15:23 +02:00
Philippe GRAND
0492492df1 fix merge 2018-09-04 12:30:06 +02:00
Laurent Destailleur
3ef808cb9b Fix #9302 MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES broken 2018-09-04 11:23:28 +02:00
Laurent Destailleur
9042d341f0 FIX #9316 Error when listing invoices 2018-09-04 11:19:31 +02:00
Laurent Destailleur
e7d2bcc34c FIX #9316 Error when listing invoices 2018-09-04 11:17:08 +02:00
Laurent Destailleur
9697bdf3b0 FIX #9393 inconsistency behaviour. option FACTURE_ENABLE_NEGATIVE_LINES 2018-09-04 10:38:09 +02:00
Laurent Destailleur
db6f80e2ff FIX invoice popup hide localtax2 and 3 if not defined 2018-09-04 00:42:15 +02:00
Laurent Destailleur
3d50c454c1 Code comment 2018-09-03 17:05:44 +02:00
Frédéric FRANCE
22b9632555
move phpcs:ignore 2018-09-02 21:08:57 +02:00
Frédéric FRANCE
35232b753a
move phpcs:ignore 2018-09-02 20:37:12 +02:00
Frédéric FRANCE
2a5c994009
move phpcs:ignore 2018-09-02 14:01:37 +02:00
Frédéric FRANCE
04c1a7d4af
move phpcs:ignore 2018-09-02 13:38:11 +02:00
Philippe GRAND
3de16a145e Standardize and update code 2018-09-02 11:08:41 +02:00
Philippe GRAND
c4f05aff28 Standardize and update code 2018-09-02 10:42:31 +02:00
Frédéric FRANCE
47879d44bc
move phpcs:ignore 2018-09-02 09:57:19 +02:00
Philippe GRAND
ae2df6be11 Standardize and Update code 2018-09-01 23:04:46 +02:00
Philippe GRAND
5d273960dc fix conflict 2018-09-01 22:40:38 +02:00
Laurent Destailleur
c8912d6a4f
Merge pull request #9242 from frederic34/camelCaps 
mark non camelCaps function
 2018-09-01 15:37:56 +02:00
Philippe GRAND
f77dd2ebc7 Standardize and update code 2018-09-01 15:13:59 +02:00
Philippe GRAND
c013f9cf3d Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-09-01 15:13:04 +02:00
Laurent Destailleur
c2548b8b39
Merge pull request #9298 from ksar-ksar/Upd_hook_formConfirm 
NEW hook formConfirm always called if hooked
 2018-09-01 14:50:08 +02:00
Philippe GRAND
17e349eba2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-09-01 14:27:53 +02:00
Laurent Destailleur
bcee0ef0ae Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/societe/class/societe.class.php
	htdocs/stripe/config.php
 2018-09-01 14:16:57 +02:00
Philippe GRAND
7b47c79bc3 precise label comment 2018-09-01 14:06:58 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Philippe GRAND
7354e485b0 precise label comment 2018-09-01 13:22:08 +02:00
Philippe GRAND
1944ef0dc3 conflict resolution 2018-09-01 12:38:22 +02:00
Laurent Destailleur
b863b5176d
Merge pull request #9322 from grandoc/new_branch_29_08_2018 
New branch 29 08 2018
 2018-09-01 12:11:01 +02:00
Philippe GRAND
bb05e80a87 Standardize and update code 2018-08-31 18:47:25 +02:00
Philippe GRAND
edaa575435 Standardize and update code 2018-08-31 18:36:15 +02:00
Philippe GRAND
2f307aae21 Standardize and update code 2018-08-31 18:06:17 +02:00
Philippe GRAND
9e880d3e72 Standardize and update code 2018-08-31 17:55:31 +02:00
Laurent Destailleur
6af8f8f475 Fix trans 2018-08-31 16:57:50 +02:00
Philippe Grand
b3c84ac3bc
Merge branch 'develop' into new_branch_29_08_2018 2018-08-30 12:09:40 +02:00
Philippe GRAND
2e66c65650 WTF... 2018-08-30 12:03:20 +02:00
ksar-ksar
49d3bea192 Remove the test 
After discussion with Frederic, the best solution is to remove the test
 2018-08-30 11:27:48 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Frédéric FRANCE
cbdc669ba9
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-29 18:45:36 +02:00
Frédéric FRANCE
7b2bfb28c2
Merge remote-tracking branch 'upstream/develop' into trimtrailing2 2018-08-29 12:48:12 +02:00
Philippe Grand
0ab593fdb1
Merge branch 'develop' into new_branch_29_08_2018 2018-08-29 12:47:01 +02:00
Philippe GRAND
4b7dd5ace3 Fix white spaces 2018-08-29 12:29:05 +02:00
Philippe GRAND
88ad651743 Fix white spaces 2018-08-29 12:26:47 +02:00
Philippe GRAND
e92b96acfd try to fix space errors 2018-08-29 12:00:53 +02:00
Laurent Destailleur
0eb4f8bb96 NEW Can set the datestart and dateend of cron job into module descriptor 2018-08-29 11:47:20 +02:00
Laurent Destailleur
b5c2383f65 Fix type of invoice encoded twice 2018-08-28 18:34:53 +02:00
Philippe Grand
b7bc34963a
Update paymentsalary.class.php 2018-08-28 10:41:05 +02:00
Philippe Grand
1337d85a29
Update bankcateg.class.php 2018-08-28 10:40:41 +02:00
Philippe GRAND
65af8f902f Update and standardize code 2018-08-28 09:44:54 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-28 09:34:53 +02:00
Frédéric FRANCE
1182f29864
trimtrailing 2018-08-28 08:33:02 +02:00
Laurent Destailleur
7219bac0b2
Merge pull request #9168 from frederic34/trimtrailing 
Trimtrailing
 2018-08-28 02:30:02 +02:00
Laurent Destailleur
1842a4bb41
Merge pull request #9278 from grandoc/new_branch_21_08_2018 
Update and standardize code
 2018-08-28 02:13:28 +02:00
Frédéric FRANCE
d8bf4a0ecf
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-25 09:07:04 +02:00
ksar-ksar
a844855ade Update hook formConfirm 
The hook should be called when the $formconfirm is not empty
 2018-08-24 16:40:26 +02:00
Laurent Destailleur
32594e8048 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-24 10:47:10 +02:00
Laurent Destailleur
a82d86cec4 FIX warning for late template invoices to remove when suspended 2018-08-24 10:46:47 +02:00
Philippe GRAND
2fa82edd39 Standardize and update code 2018-08-23 17:07:27 +02:00
Philippe Grand
137b715868
Update deplacementstats.class.php 2018-08-22 22:28:33 +02:00
Philippe GRAND
504b0e3d16 Update and standardize code 2018-08-22 18:34:50 +02:00
Philippe GRAND
6542dcf0bd Update and standardize code 2018-08-22 12:04:50 +02:00
Philippe GRAND
e0462b975b Update and standardize code 2018-08-22 11:48:26 +02:00
Philippe GRAND
95349365ba Update and standardize code 2018-08-22 11:39:37 +02:00
Philippe GRAND
0ffad50974 Update and standardize code 2018-08-22 11:24:31 +02:00
Philippe GRAND
29f15b4ae6 Update and standardize code 2018-08-22 10:51:55 +02:00
Philippe GRAND
a669830427 Update and standardize code 2018-08-22 10:37:16 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-21 20:57:58 +02:00
Frédéric FRANCE
0fbccce9a7
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-21 19:59:07 +02:00
Laurent Destailleur
db3c17668e Fix coding style 2018-08-21 19:08:11 +02:00
Frédéric FRANCE
aba69b94b2
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-21 14:03:02 +02:00
Laurent Destailleur
0799970804
Merge pull request #9248 from frederic34/FunctionDeclaration 
function declaration
 2018-08-21 13:41:56 +02:00
Laurent Destailleur
85eed6cf80
Merge branch 'develop' into trimtrailing 2018-08-21 13:40:04 +02:00
Laurent Destailleur
289f194641
Merge pull request #9058 from defrance/patch-123 
New : Add total price on dashboard
 2018-08-21 13:33:33 +02:00
Laurent Destailleur
5e09d5160f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-21 13:17:20 +02:00
Laurent Destailleur
0f1e5a78c6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-21 13:17:11 +02:00
Laurent Destailleur
7103bfd7aa
Merge pull request #9253 from frederic34/patch-11 
Update list.php
 2018-08-21 13:11:26 +02:00
Laurent Destailleur
b40e32b8c3
Merge pull request #9264 from grandoc/new_branch_17_08_2018 
standardize code
 2018-08-21 12:52:34 +02:00
Laurent Destailleur
8032c314d4
Merge pull request #9252 from bugness-chl/8.0-2 
FIX adding GROUP BY for PostgreSQL
 2018-08-21 12:51:56 +02:00
Laurent Destailleur
26d34422b0 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-19 03:01:26 +02:00
Laurent Destailleur
116f4a1a09 Fix responsive 2018-08-19 02:22:12 +02:00
Philippe GRAND
c48211ad70 Update and standardize code 2018-08-17 19:31:22 +02:00
Frédéric FRANCE
e63a748a70
Update list.php 2018-08-16 11:59:58 +02:00
Frédéric FRANCE
39462742e2
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-16 08:17:55 +02:00
Chl
9e8485c279 FIX adding GROUP BY for PostgreSQL 2018-08-16 01:14:42 +02:00
Laurent Destailleur
b515511ad6
Merge branch 'develop' into FunctionDeclaration 2018-08-16 00:52:55 +02:00
Laurent Destailleur
5c712a6cd3
Merge branch 'develop' into trimtrailing 2018-08-16 00:47:09 +02:00
Laurent Destailleur
3b245f1b30
Merge pull request #9247 from frederic34/missingReturn 
return comment
 2018-08-16 00:35:39 +02:00
Frédéric FRANCE
69a7af88e7
function declaration 2018-08-15 18:14:02 +02:00
Frédéric FRANCE
7bb781eea8
function declaration 2018-08-15 14:28:34 +02:00
Laurent Destailleur
ec56ad752c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-08-15 14:26:38 +02:00
Frédéric FRANCE
d25fa61998
return comment 2018-08-14 13:14:55 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function 2018-08-13 17:26:32 +02:00
Laurent Destailleur
b977c3a9f5 Fix translation 2018-08-13 14:04:10 +02:00
Frédéric FRANCE
82e8efe792
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-12 20:14:14 +02:00
Laurent Destailleur
9fc5d39d07 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-12 20:09:36 +02:00
Laurent Destailleur
dc8c4402ee Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-12 20:09:22 +02:00
Laurent Destailleur
0a1c6e7194 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/list.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
 2018-08-12 20:08:20 +02:00
Frédéric FRANCE
62db9a4022
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-12 19:54:03 +02:00
Laurent Destailleur
2d571acc03 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/commande/list.php
 2018-08-12 19:25:44 +02:00
Laurent Destailleur
30b4d88428 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/product/reassort.php
	htdocs/societe/list.php
 2018-08-12 19:23:45 +02:00
Frédéric FRANCE
6f74ecceaf
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-12 18:21:59 +02:00
Laurent Destailleur
2f559a7edb
Merge pull request #9199 from atm-quentin/FIX_hook_update_price 
NEW Add hook changeRoundingMode in update_price
 2018-08-12 18:17:52 +02:00
Laurent Destailleur
35c22b231f
Merge pull request #9223 from grandoc/new_branch_08_08_2018 
Standardize
 2018-08-12 18:12:18 +02:00
Laurent Destailleur
12e21b4886 FIX update extrafields 2018-08-12 16:29:26 +02:00
ATM-Nicolas
d8d54d246c FIX : Pagination on withdraw request list 2018-08-10 15:05:21 +02:00
Frédéric FRANCE
62b83412ee
test phpcs v3 2018-08-09 11:31:48 +02:00
Philippe GRAND
5b8b4a1415 Standardize 2018-08-08 12:29:36 +02:00
Juanjo Menent
229a5d3532
Merge pull request #9203 from grandoc/new_branch_04_08_2018 
comment translation
 2018-08-08 11:07:18 +02:00
Frédéric FRANCE
9025c452ef
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-07 16:40:03 +02:00
Philippe GRAND
948647f3f9 comment translation 2018-08-04 14:17:51 +02:00
atm-quentin
6662bf05ba FIX hook on update price AND fix id on line 2018-08-03 11:47:43 +02:00
ATM-Nicolas
342a3ef663 NEW : Withdraw request massaction 2018-08-03 09:57:29 +02:00
Laurent Destailleur
e85ec19018
Merge pull request #9093 from atm-gauthier/FIX_filters 
FIX : page must always be 0 when we search
 2018-08-02 17:48:35 +02:00
Juanjo Menent
b8efe3b239
Merge pull request #9172 from grandoc/new_branch_28_07_2018 
standardize
 2018-08-02 11:27:02 +02:00
Juanjo Menent
788060aa28
Merge pull request #9178 from aspangaro/9.0_a3 
NEW : Add project on salaries
 2018-08-02 11:19:34 +02:00
Juanjo Menent
37a9a2df56
Merge pull request #9167 from frederic34/include 
Include and co are statements
 2018-08-02 11:03:44 +02:00
Alexandre SPANGARO
ee61a88540 Small fix 2018-08-01 07:46:17 +02:00
John BOTELLA
4ddca02bb9 fix situation line's total 2018-07-31 14:58:33 +02:00
Alexandre SPANGARO
0509a176ca
Merge branch 'develop' into 9.0_a3 2018-07-31 07:47:43 +02:00
Alexandre SPANGARO
b0e2e69ed0 New : Add project on salaries 2018-07-31 07:45:03 +02:00
Philippe GRAND
d673848028 standardize 2018-07-30 17:28:44 +02:00
Philippe GRAND
fb565b15c5 standardize 2018-07-29 19:16:28 +02:00
Frédéric FRANCE
c991a4d204
trim trailing 2018-07-26 18:05:20 +02:00
Frédéric FRANCE
a0a5d33641
test include 2018-07-26 17:30:53 +02:00
Philippe GRAND
7d5464cfbc Clean and update code 2018-07-25 15:25:23 +02:00
Laurent Destailleur
e024ea9c05
Merge pull request #9146 from grandoc/new_branch_24_07_2018 
Clean and update code
 2018-07-24 21:41:12 +02:00
Laurent Destailleur
dc2fec8f57 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-24 19:37:04 +02:00
Philippe GRAND
2a6f050e32 Clean and update code 2018-07-24 18:28:56 +02:00
Laurent Destailleur
ece655a84a
Merge pull request #9128 from atm-john/fix_situation_invoice_status 
Fix situation invoice status
 2018-07-24 17:49:53 +02:00
Laurent Destailleur
869a97c8d1
Update card.php 2018-07-24 17:49:10 +02:00
Laurent Destailleur
a469f841f7
Merge pull request #9140 from bugness-chl/8.0-bugfix-pdf 
FIX 2 bugfix for PDF generated by Templates/Cron: DueDate and translation
 2018-07-24 17:47:37 +02:00
Laurent Destailleur
bb9c53b41f
Merge pull request #9118 from bugness-chl/8.0 
corr. "group by" for PostgreSQL
 2018-07-24 17:43:36 +02:00
Chl
0f115dafee 2 bugfix for PDF generated by Templates/Cron: DueDate and translation 
When launching Cron on a facturerec with auto_validate at 1, the
generated PDF doesn't contain the DueDate, and some tokens like
__INVOICE_PREVIOUS_MONTH_TEXT__ in the public notes are not
translated (tested with fr_FR).
 2018-07-24 00:39:21 +02:00
Laurent Destailleur
2c7029850a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/website.lib.php
	htdocs/website/index.php
 2018-07-21 20:28:26 +02:00
John BOTELLA
0c01f6e139 Fix situation invoice status 2018-07-20 15:53:32 +02:00
Laurent Destailleur
5523312f87 Fix missing email 2018-07-18 15:36:07 +02:00
Laurent Destailleur
38de5a8f2a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-18 14:25:19 +02:00
Laurent Destailleur
bef777e19d Fix default order for bank entry list 2018-07-18 14:24:58 +02:00
Chl
b306394c15 corr. group by pour PostgreSQL 2018-07-17 23:57:21 +02:00
Laurent Destailleur
f60e04dcb4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-17 22:33:36 +02:00
Laurent Destailleur
cecb0f8829 Fix missing lib 2018-07-17 22:33:20 +02:00
Laurent Destailleur
4b044779dc Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-17 22:31:58 +02:00
Laurent Destailleur
969aea98e1 Fix label of copy must not be same 2018-07-17 22:31:28 +02:00
Laurent Destailleur
47cb1f920e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-17 21:43:08 +02:00
Laurent Destailleur
7662f8f25c Fix balance 2018-07-17 21:39:41 +02:00
Laurent Destailleur
c68b9493e5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-17 21:21:20 +02:00
Laurent Destailleur
a7853211d6 Fix balance when sorting of value date desc 2018-07-17 21:20:38 +02:00
Laurent Destailleur
34c2facff1 Fix missing link on bank account 2018-07-17 18:16:30 +02:00
Laurent Destailleur
387abf2da8
Merge pull request #9057 from inoveaconseil/checkRightOnLink 
ADD Check right on link
 2018-07-16 09:31:21 +02:00
Laurent Destailleur
e4be3ab954 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-13 09:09:51 +02:00
Laurent Destailleur
1b33703cd8 Fix missing country code 2018-07-13 09:08:42 +02:00
gauthier
80ff7fa86f FIX : case when we valid form with keyboard 2018-07-11 15:18:30 +02:00
gauthier
103c7e6d06 FIX : page must always be 0 when we search (to avoid case : when we're on page 3 and we're looking for a precise thirdparty, we stay on page 3 and nothing's displaied) 2018-07-11 09:51:36 +02:00
Laurent Destailleur
45d1a14c8e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-06 16:10:37 +02:00
Laurent Destailleur
ed6ec8138d Fix filter on invoice status 2018-07-06 16:06:15 +02:00
Laurent Destailleur
fb84211714 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-06 12:45:44 +02:00
Laurent Destailleur
6c5264fabb Fix label 2018-07-06 12:45:20 +02:00
Inovea Conseil
7f137adef9 ADD check user's rights 2018-07-06 08:07:38 +02:00
delcroix Patrick
5f7a308552
Merge branch 'develop' into comptafiles 2018-07-05 22:35:40 +02:00
patrick Delcroix
a90974378e FIX: credit / debit 2018-07-05 22:31:29 +02:00
patrick Delcroix
0e7ba92784 New: Accounting dossier file checks page 
Page to check to attachement of those operation
invoice, invoicesupplier, salary, donation, Expense, tax
 2018-07-05 21:34:36 +02:00
Inovea Conseil
5011f252c1 ADD check user's rights 2018-07-05 19:00:41 +02:00
BENKE Charlene
c169ff4b97
Update facture.class.php 2018-07-05 12:01:48 +02:00
Inovea Conseil
30cff2bb36 ADD check user's rights 2018-07-05 11:52:41 +02:00
Laurent Destailleur
12c43d7722 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-03 12:33:17 +02:00