Laurent Destailleur
760121a3d1
Can sort list of answers.
2020-04-11 14:13:16 +02:00
Scrutinizer Auto-Fixer
444c293c01
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-10 08:59:32 +00:00
Laurent Destailleur
6a60678186
Look and feel v12
2020-04-09 16:36:39 +02:00
Laurent Destailleur
03b09f1d28
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-05 12:14:03 +02:00
Laurent Destailleur
13b47774e2
FIX #13424
2020-04-05 11:55:43 +02:00
Laurent Destailleur
b8c2dd6025
Look and feel v12
2020-04-02 15:11:46 +02:00
Laurent Destailleur
8bab245c7e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/tpl/contacts.tpl.php
2020-03-18 18:50:55 +01:00
Laurent Destailleur
c1931a045e
Merge pull request #13376 from fmarcet/11.0
...
FIX: Bank movements color is not showing
2020-03-18 18:22:46 +01:00
Ferran Marcet
1fe4e4415e
FIX: Bank movements color is not showing
2020-03-18 09:27:08 +01:00
Laurent Destailleur
33c5db9cc3
Prepare code for the new pagination possibility
2020-03-13 13:07:11 +01:00
Scrutinizer Auto-Fixer
f413ce6aac
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-12 11:45:44 +00:00
Tobias Sekan
9dd362a22c
NEW Category filter on bank list
2020-03-09 11:43:15 +01:00
Laurent Destailleur
aa1552dbc0
Enhance graphs
2020-03-05 00:17:16 +01:00
Laurent Destailleur
f5a07dfb7e
Add status into popup
2020-02-28 18:57:17 +01:00
Laurent Destailleur
d172a95dfe
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-25 14:37:04 +01:00
Laurent Destailleur
6366881f91
FIX #13175
2020-02-24 00:41:25 +01:00
Laurent Destailleur
189c0d675b
Fix memory report. Xdebug no more required. Try = null instead of unset.
2020-02-23 22:05:59 +01:00
Scrutinizer Auto-Fixer
e44865d8b5
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-21 16:53:37 +00:00
Laurent Destailleur
44eda2d4ad
Fix doxygen
2020-02-20 13:42:43 +01:00
Laurent Destailleur
895503d2eb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/index.php
htdocs/core/class/CMailFile.class.php
2020-02-20 00:21:25 +01:00
Laurent Destailleur
3fafbb372b
Remove call of $mc->dao than hangs. Replaced with $mc use.
2020-02-19 15:51:27 +01:00
Laurent Destailleur
4f3cc87077
FIX Confusion between 'bank reconciled' and 'accounted'. Show both data
2020-02-05 19:23:38 +01:00
Laurent Destailleur
30fa8940a9
FIX Confusion between 'bank reconciled' and 'accounted'. Show both data
2020-02-05 19:23:00 +01:00
Laurent Destailleur
f3e27695e2
FIX Avoid deletion of bank record if in accounting
2020-02-05 16:35:50 +01:00
Laurent Destailleur
44ed5980f5
FIX Avoid deletion of bank record if in accounting
2020-02-05 16:35:09 +01:00
Laurent Destailleur
7b10c2440b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-29 23:08:42 +01:00
Michael Jeanmotte
f1f83656f1
Feature Request: Dolibarr API - [GET] /bankaccounts/{id}/lines : add sqlfilters #11259
2020-01-29 22:54:35 +01:00
Laurent Destailleur
92856788a3
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-20 18:39:46 +01:00
Laurent Destailleur
b8938b8d19
Fix look and feel v11
2020-01-20 02:18:00 +01:00
Laurent Destailleur
7c5485288b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-19 20:34:20 +01:00
Laurent Destailleur
62b9fbb67f
Fix link
2020-01-19 20:33:55 +01:00
Laurent Destailleur
6b6c9efe5e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-19 19:56:21 +01:00
Laurent Destailleur
99f679493b
Fix search
2020-01-19 19:51:40 +01:00
Laurent Destailleur
526ae83e8f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-19 19:49:16 +01:00
Laurent Destailleur
e679e05f57
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-19 19:49:04 +01:00
Laurent Destailleur
19ab802aaf
Fix disabling of balance
2020-01-19 19:48:19 +01:00
Laurent Destailleur
d6bdbccf4f
Fix link
2020-01-19 19:33:57 +01:00
Laurent Destailleur
178dd518cf
Merge branch 'develop' into scrutinizer-patch-5
2020-01-18 19:36:36 +01:00
Scrutinizer Auto-Fixer
8744f6ab7b
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-18 15:17:07 +00:00
Laurent Destailleur
73d56358e1
Fix bad param
2020-01-18 16:13:10 +01:00
Laurent Destailleur
4e4a810484
Merge pull request #12368 from aspangaro/11.0_a5
...
NEW Various payment list - Add search date start & date end & subledger account
2020-01-15 17:51:59 +01:00
Laurent Destailleur
3f79c00542
Merge branch 'develop' into actioncomm_category
2020-01-15 14:21:06 +01:00
Laurent Destailleur
9ebdd82edb
Fix We must refuse to delete a various payment if payment was dispatched
...
in accountancy.
2020-01-10 02:43:24 +01:00
Laurent Destailleur
675ce3b32f
Fix sql error on update of subledger account on a various payment
...
Fix warning message that was not accurate
2020-01-10 02:20:08 +01:00
Laurent Destailleur
38de69f5a9
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/admin/dict.php
htdocs/comm/action/list.php
htdocs/compta/bank/releve.php
htdocs/compta/salaries/card.php
htdocs/core/actions_addupdatedelete.inc.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/boxes.lang
htdocs/langs/en_US/main.lang
htdocs/product/class/product.class.php
htdocs/product/reassort.php
htdocs/product/stock/product.php
htdocs/projet/element.php
2020-01-04 14:20:25 +01:00
Alexandre SPANGARO
f14aaf5e50
FIX Some problems on conciliation with others modules
2020-01-03 16:35:02 +01:00
Frédéric FRANCE
90235d0528
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-31 13:57:40 +01:00
Laurent Destailleur
8202a67e4e
Fix look and feel v11
2019-12-25 23:15:56 +01:00
Alexandre SPANGARO
ab0f77b467
Merge remote-tracking branch 'upstream/develop' into 11.0_a5
2019-12-23 21:15:17 +01:00
Laurent Destailleur
f44b85f557
Fix $_SESSION['newtoken'] must be newToken()
2019-12-18 23:12:31 +01:00
Laurent Destailleur
9685b56375
Fix warning
2019-12-15 15:03:22 +01:00
Laurent Destailleur
835d22f556
Merge branch 'develop' into doxygen_todo
2019-12-14 13:46:40 +01:00
Laurent Destailleur
8fbaae3fef
Merge pull request #12694 from frederic34/patch-8
...
doxygen
2019-12-14 13:43:47 +01:00
Frédéric FRANCE
57055bad03
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-13 14:36:00 +01:00
Laurent Destailleur
ce47de453e
Fix HTML5
2019-12-12 10:31:08 +01:00
Frédéric FRANCE
9357bfd98e
doxygen
2019-12-12 08:17:14 +01:00
Frédéric FRANCE
269e53583d
doxygen
2019-12-11 23:46:12 +01:00
Laurent Destailleur
5454380834
CSS
2019-12-11 19:14:41 +01:00
Scrutinizer Auto-Fixer
4debd71281
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-06 08:26:49 +00:00
Frédéric FRANCE
d9bfa62367
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-05 21:47:42 +01:00
Laurent Destailleur
5f148be56f
Fix responsive
2019-12-04 16:43:56 +01:00
Frédéric FRANCE
4c5c6b6ff1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-03 17:56:43 +01:00
Scrutinizer Auto-Fixer
36a74cd160
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-03 10:17:29 +00:00
Frédéric FRANCE
25ed2b930f
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-01 16:10:37 +01:00
ATM John BOTELLA
773f823748
factoring token usage
2019-12-01 10:20:11 +01:00
Scrutinizer Auto-Fixer
5f99e25c45
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-28 11:36:20 +00:00
Frédéric FRANCE
b2912e688b
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-27 22:54:05 +01:00
Alexandre SPANGARO
0f6de0049c
Fix
2019-11-26 21:17:22 +01:00
Alexandre SPANGARO
d910b05a38
Look & Feel v11
2019-11-26 20:28:24 +01:00
Frédéric FRANCE
4c4ae5b6e1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-26 08:10:40 +01:00
Frédéric FRANCE
f3f308fc1b
Update graph.php
2019-11-26 00:11:02 +01:00
Laurent Destailleur
f9092b1b8e
Fix responsive
2019-11-20 13:22:40 +01:00
Frédéric FRANCE
2e5f539b2a
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-18 17:45:52 +01:00
Alexandre SPANGARO
1e2fd1f25a
Merge remote-tracking branch 'upstream/develop' into 11.0_a5
2019-11-17 21:55:25 +01:00
Laurent Destailleur
2689f7515c
Fix pb with colspan and extrafields.
...
Fix remove empty id
2019-11-16 14:38:05 +01:00
Frédéric FRANCE
6784ea9fae
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-16 09:21:57 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-14 11:09:15 +00:00
Frédéric FRANCE
a3e092b227
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-14 09:21:26 +01:00
Laurent Destailleur
171b94fc5c
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5
...
Scrutinizer Auto-Fixes
2019-11-14 08:50:24 +01:00
Laurent Destailleur
86094613e8
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4
...
Scrutinizer Auto-Fixes
2019-11-14 08:50:06 +01:00
Frédéric FRANCE
446c66da62
use class CONST
2019-11-14 08:15:39 +01:00
Scrutinizer Auto-Fixer
b40ecc3933
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer
ac40dd8bbe
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer
8a527631a0
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:02 +00:00
Scrutinizer Auto-Fixer
c85e54b08c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-12 08:46:08 +00:00
Scrutinizer Auto-Fixer
df664e790b
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-11 23:15:34 +00:00
Laurent Destailleur
2ccef4e469
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
2019-11-11 19:10:35 +01:00
Laurent Destailleur
4fce0d3e7a
Fix not transversable
2019-11-08 15:52:57 +01:00
Scrutinizer Auto-Fixer
2ecfe41810
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-08 09:53:31 +00:00
Laurent Destailleur
c0b8684475
Merge pull request #12341 from inoveaconseil/bankStatementDocument
...
NEW add upload for account statement
2019-11-07 15:06:47 +01:00
Laurent Destailleur
5a4a421a8e
FIX #12372
2019-11-07 13:07:40 +01:00
Alexandre SPANGARO
b85dc0c5e5
NEW Various payment list - Add search date start & date end & subledger_account
2019-11-07 09:19:48 +01:00
Nicolas
f18bca7687
Merge remote-tracking branch 'origin/bankStatementDocument' into bankStatementDocument
2019-11-06 20:51:17 +01:00
Nicolas
4143988614
NEW Add upload document on account statement
2019-11-06 20:50:02 +01:00
Inovea Conseil
fed6ed8760
Merge remote-tracking branch 'Dolibarr/develop' into bankStatementDocument
2019-11-06 20:48:24 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent
2019-11-05 21:24:41 +01:00
stickler-ci
f537ae60b6
Fixing style errors.
2019-11-05 12:52:58 +00:00
Nicolas
991e1b2747
NEW Add upload document on account statement
2019-11-05 13:51:52 +01:00
Laurent Destailleur
ce1dec253f
FIX #11364
2019-11-05 12:47:38 +01:00
Laurent Destailleur
ec8bd6327d
Fix css
2019-11-04 18:53:46 +01:00
Laurent Destailleur
11500fb8d9
FIX confusion between permto... and permisstionto...
2019-11-04 15:33:49 +01:00
Laurent Destailleur
89f1904793
Finish removing of ->attribute_label
2019-11-02 17:26:26 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid
...
replace deprecated user->societe_id by user->socid
2019-11-02 13:34:21 +01:00
Laurent Destailleur
45c77b4560
Renaming some libelle into label
2019-11-02 12:59:38 +01:00
Frédéric FRANCE
77d4ca81dc
Merge remote-tracking branch 'upstream/develop' into socid
2019-11-02 09:14:15 +01:00
Laurent Destailleur
cea2c3a9f4
Look and feel v11
2019-11-01 23:58:14 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid
2019-10-31 20:46:31 +01:00
Frédéric FRANCE
a1f0245c79
clean indent in compta, contact directory
2019-10-26 18:13:20 +02:00
Frédéric FRANCE
79825e2193
start clean indent in compta directory
2019-10-26 14:42:25 +02:00
Laurent Destailleur
b4eb14ee44
Use dolGetStatus
2019-10-24 16:43:23 +02:00
Laurent Destailleur
9a386da7f5
NEW Can crop/resize image attached on a bank record
2019-10-23 16:07:09 +02:00
Laurent Destailleur
31ad147e0e
Look and feel v11
2019-10-23 15:17:01 +02:00
Laurent Destailleur
02f559db5f
Use GETPOST
2019-10-23 15:07:21 +02:00
Laurent Destailleur
564f96c092
Fix scrutinizer warnings
2019-10-23 14:59:02 +02:00
Laurent Destailleur
b88968520b
Move code of extrafields to the new architecture
2019-10-22 17:08:37 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
2019-10-16 20:00:01 +02:00
Laurent Destailleur
e07e01580d
Replace deprecated code with new one
2019-10-16 03:34:32 +02:00
Laurent Destailleur
ebd8bc3645
Merge pull request #12107 from frederic34/patch-14
...
Update list.php
2019-10-14 20:57:01 +02:00
Frédéric FRANCE
b424fc6e27
Update list.php
2019-10-12 18:57:08 +02:00
Frédéric FRANCE
cef935468d
Update list.php
2019-10-12 18:40:39 +02:00
Laurent Destailleur
bcc41c2a33
NEW Can filter on description on bank account transaction lists.
2019-10-12 13:19:10 +02:00
Laurent Destailleur
5970ea5b79
Update releve.php
2019-10-08 15:48:29 +02:00
Laurent Destailleur
d6bf0fa483
Update releve.php
2019-10-08 15:47:47 +02:00
fuhraih
368b34c5c2
FIX #11835
...
FIX #11835 edit Bank Statements in second Page and so on not working
2019-10-08 15:34:35 +02:00
Laurent Destailleur
43a70e5548
Clean code to use the new $extrafields->attributes array
2019-10-08 09:28:50 +02:00
Laurent Destailleur
c2a7ae23bc
Merge pull request #12034 from aspangaro/11_faicon
...
Fix Fa-icon
2019-10-07 13:03:27 +02:00
Laurent Destailleur
52c06c1815
Fix css
2019-10-06 19:28:08 +02:00
Laurent Destailleur
866dcf18fe
Look and feel v11
2019-10-06 15:34:22 +02:00
Laurent Destailleur
2b66282b61
NEW Code for extrafields uses the new array $extrafields->attributes
2019-10-06 14:41:52 +02:00
Alexandre SPANGARO
14381927c7
Fix Bank Fa-icon
2019-10-03 20:32:15 +02:00
Laurent Destailleur
24570f7165
Look and feel v11. Picto are fontawesome.
2019-10-02 18:14:41 +02:00
Alexandre SPANGARO
91b3bf76fd
Merge branch 'develop' into 11.0_https
2019-10-01 06:11:43 +02:00
Laurent Destailleur
6858dce344
Rename table for categorie of warehouses
2019-09-27 13:28:28 +02:00
Alexandre SPANGARO
02dbc11f98
Move Gnu.org to https
2019-09-23 21:55:30 +02:00
Laurent Destailleur
41a2a25729
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/ligne.php
2019-09-17 12:23:58 +02:00
Laurent Destailleur
5233e7d8ad
FIX do not output return code on screen after a select of bank account
2019-09-16 18:29:04 +02:00
Laurent Destailleur
6bfba0b731
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
2019-09-15 15:17:38 +02:00
Alexandre SPANGARO
21e27389d4
NEW Bank Add an option for colorize background color of debit or credit movement
2019-09-14 20:58:12 +02:00
Alexandre SPANGARO
4420af683d
Fix Bank entries - nowrap on amount
2019-09-14 05:44:28 +02:00
Laurent Destailleur
481a25cb8f
The hook "moreFamily" must return payment into var "totalpayment" and no
...
more "paiement" (english replace french).
2019-09-03 17:39:19 +02:00
Laurent Destailleur
da3d230182
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.stickler.yml
htdocs/takepos/invoice.php
2019-09-03 17:34:49 +02:00
Laurent Destailleur
84800257e8
Merge pull request #11799 from jtraulle/fix-11683-10.0
...
Fix #11682 Missing origin object ref and thirdparty ref in future ban…
2019-09-03 17:32:47 +02:00
Laurent Destailleur
7c07e64adc
Update treso.php
2019-09-03 17:32:18 +02:00
Laurent Destailleur
65fee73b22
Update treso.php
2019-09-03 17:31:20 +02:00
Jean Traullé
8f1fba6775
Fix #11682 Missing origin object ref and thirdparty ref in future bank entries
2019-08-30 23:56:52 +02:00
Laurent Destailleur
999db7ed41
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/salaries/card.php
htdocs/compta/sociales/class/chargesociales.class.php
htdocs/takepos/invoice.php
2019-08-26 16:49:25 +02:00
Alexandre SPANGARO
76691925a4
FIX Missing div for buttons in tax, loan, various payment modules
2019-08-26 15:35:20 +02:00
Laurent Destailleur
3339f89fc5
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/api/class/api_login.class.php
htdocs/dav/fileserver.php
2019-08-22 12:45:23 +02:00
Laurent Destailleur
27cd6cd308
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/compta/paiement.php
htdocs/product/fournisseurs.php
htdocs/stripe/payment.php
2019-08-22 12:39:07 +02:00
Laurent Destailleur
a35f010e55
FIX name and position of hook FIX #11710
2019-08-22 12:30:14 +02:00
Laurent Destailleur
6abfd8b145
Fix use short labels for workboard
2019-08-19 10:01:42 +02:00
Laurent Destailleur
c989a63360
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/langs/en_US/cashdesk.lang
2019-08-18 20:54:06 +02:00
Laurent Destailleur
f27bea9497
Fix phpcs
2019-08-18 20:39:02 +02:00
Laurent Destailleur
ad5f2dbe9d
Fix update on id
2019-08-18 18:56:58 +02:00
Laurent Destailleur
8cf0671804
FIX Missing transaction
2019-08-18 18:56:21 +02:00
Jean Traullé
e0310b5d9b
Fix #11682 Missing origin object ref and thirdparty ref in future bank entries
2019-08-16 11:38:42 +02:00
Jean Traullé
6edf5494c3
Added @throws annotations for possible exceptions
2019-08-15 15:29:37 +02:00
Jean Traullé
f37b8c78c8
NEW Add POST /bankaccounts/transfer REST API endpoint.
...
This allow internal transfers between two bankaccounts.
2019-08-15 15:18:09 +02:00
Frédéric FRANCE
aa462bac23
Add empty index.html
2019-08-09 09:25:48 +02:00
Laurent Destailleur
4833c2bf49
Merge
2019-07-22 18:50:17 +02:00
Alexandre SPANGARO
5f042cf6ad
QUAL Move ligne.php to line.php
2019-07-19 23:19:06 +02:00
Alexandre SPANGARO
9ab0734415
NEW Extrafields on salaries
2019-07-19 23:08:24 +02:00
Laurent Destailleur
ee109ac568
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-05 17:44:50 +02:00
Laurent Destailleur
675b7b2e32
Fix link to reconcile
2019-07-05 13:11:30 +02:00
Laurent Destailleur
575dce2dff
Fix css
2019-07-05 12:17:36 +02:00
Laurent Destailleur
5675e7c50e
Clean code of deprecated method
2019-06-22 18:19:40 +02:00
Laurent Destailleur
d47cf87c00
Look and feel v10
2019-06-20 17:59:28 +02:00
Laurent Destailleur
afb6362317
Fix look and feel v10
...
Fix link to direct debit payment order
2019-06-20 13:37:06 +02:00
Laurent Destailleur
e060af5c97
Update treso.php
2019-06-20 02:50:23 +02:00
Alexandre SPANGARO
a849fbe42e
Nowrap on amount
2019-06-19 07:15:52 +02:00
Laurent Destailleur
475f59cc2a
Update annuel.php
2019-06-12 13:10:17 +02:00
Laurent Destailleur
9d95812495
Update bankentries_list.php
2019-06-12 13:08:26 +02:00
Alexandre SPANGARO
6d43efb4a2
Align right
2019-06-09 16:35:45 +02:00
Alexandre SPANGARO
8c5a01dd90
Show total with decimals
2019-06-09 08:56:49 +02:00
Alexandre SPANGARO
33b02b97d5
Better look
2019-06-09 08:50:20 +02:00
Laurent Destailleur
bc030561ac
Debug various payment
2019-05-29 13:48:00 +02:00
Laurent Destailleur
280a034199
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-05-29 13:15:57 +02:00
Laurent Destailleur
a7dccf1617
Merge pull request #11255 from aspangaro/10.0_accountancy2
...
FIX Lost functionnality - Add category to bank transaction with various payment
2019-05-29 13:15:47 +02:00
Laurent Destailleur
cafb3840b7
Fix look and feel v10
2019-05-29 12:56:11 +02:00
Laurent Destailleur
6a84dfe29e
Update card.php
2019-05-29 12:34:54 +02:00
Alexandre SPANGARO
19b275f2d1
Fix bankline cat with various payment
2019-05-26 22:33:35 +02:00
Laurent Destailleur
b81c3a6d2b
Fix look and feel v10
2019-05-26 18:23:30 +02:00
Alexandre SPANGARO
ea13657617
Merge remote-tracking branch 'upstream/develop' into 10.0_accountancy2
2019-05-26 14:23:47 +02:00
Laurent Destailleur
5f23cf7e2a
CSS
2019-05-19 13:51:47 +02:00
Laurent Destailleur
11fea03074
Merge pull request #11026 from atm-john/new_look_and_feel_title_button
...
NEW : look and feel title button
2019-05-18 16:04:47 +02:00
John BOTELLA
f296093f8d
fix travis
2019-05-10 15:52:46 +02:00
Laurent Destailleur
091132de2f
Signatures of methods createFromClone() has been standardized. All
...
methods requires the object User as first parameter.
2019-04-25 12:11:32 +02:00
Alexandre SPANGARO
9210a39f6a
Merge branch 'develop' into 10.0_accountancy2
2019-04-24 21:49:41 +02:00
Laurent Destailleur
6da42941a8
NEW Add attached document on bank account visible in automatic ECM.
2019-04-21 19:54:30 +02:00
Laurent Destailleur
8310e09786
Fix td balance
2019-04-17 01:18:02 +02:00
John BOTELLA
a60d4b3b52
Appli btn apply to links
2019-04-16 09:09:25 +02:00
John BOTELLA
7372e8c610
Appli function to links
2019-04-15 15:47:36 +02:00
Laurent Destailleur
d7f980fda0
NEW Add picto of deletion on mass action combo lists
2019-04-09 01:22:59 +02:00
Laurent Destailleur
42fda54edf
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/card.php
htdocs/fichinter/list.php
htdocs/product/stock/replenish.php
2019-04-02 19:41:58 +02:00
Laurent Destailleur
c5348be337
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-04-02 19:35:42 +02:00
Laurent Destailleur
17a61b3232
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-04-02 19:34:49 +02:00
Laurent Destailleur
8fe1be1a67
Removed deprecated use of string in dol_print_date(). Only date allowed.
2019-04-01 19:27:34 +02:00
Laurent Destailleur
143cbba09b
Update card.php
2019-03-31 18:49:38 +02:00
Alexandre SPANGARO
5588fe5b81
FIX: Don't show journal:getNomUrl without data
...
ErrorBadValueForParamNotAString
2019-03-30 09:42:13 +01:00
Laurent Destailleur
1b2826f476
Look and feel v10
2019-03-29 13:26:26 +01:00
Laurent Destailleur
f27f65e8bf
Responsive
2019-03-25 10:09:02 +01:00
Laurent Destailleur
ee4150665e
Fix phpcs
2019-03-21 20:15:19 +01:00
Philippe GRAND
86c3b1a5b0
add some comments
2019-03-21 14:59:21 +01:00
Laurent Destailleur
f3cf3482fa
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/paiement/class/paiement.class.php
htdocs/projet/element.php
2019-03-18 10:23:14 +01:00
Laurent Destailleur
34034787af
FIX problem with sign of various payment in project preview
2019-03-18 10:16:08 +01:00
Alexandre SPANGARO
ad485b55b6
NEW: Add category to bank transaction in various payment
2019-03-10 20:01:39 +01:00
Frédéric FRANCE
f283782445
change visibility
2019-03-04 19:57:46 +01:00
Frédéric FRANCE
62501b11e8
add visibility
2019-03-02 00:14:22 +01:00
Frédéric FRANCE
4f341ea022
replace html code by html5
2019-02-23 22:56:38 +01:00
Alexandre SPANGARO
7e60c3bf84
FIX: In various payment, subledger & accout may be alphanumeric
2019-02-12 16:27:25 +01:00
Laurent Destailleur
e054b080a5
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing
2019-02-12 13:33:39 +01:00
Laurent Destailleur
6f6a767255
Merge pull request #10520 from aspangaro/develop
...
NEW: Add subledger in various payment
2019-02-12 13:20:58 +01:00
Laurent Destailleur
5c01ec158d
Fix regression
2019-02-11 15:40:33 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature
2019-02-10 10:45:49 +01:00
Frédéric FRANCE
580e5c42d2
GenericFunctionsFunctionCallArgumentSpacing
2019-02-09 12:00:49 +01:00
Laurent Destailleur
0e42e8824b
Merge branch 'develop' into new_branch_04_02_2019
2019-02-08 09:42:18 +01:00
Alexandre SPANGARO
2ba8ae00e4
Merge remote-tracking branch 'upstream/develop' into develop
2019-02-06 21:56:01 +01:00
Alexandre SPANGARO
a28c926f03
Fix
2019-02-06 21:43:16 +01:00
Philippe GRAND
386a4102b7
update with html5 compliant code
2019-02-04 13:44:02 +01:00
Philippe GRAND
b7605e233e
update with html5 compliant code
2019-02-04 13:40:00 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
2019-02-03 14:29:45 +01:00
Alexandre SPANGARO
13cf3b1d7f
Add subledger in various payment
2019-02-01 15:50:12 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma
2019-01-30 16:00:11 +01:00
Alexandre SPANGARO
cc88c4f8ff
Move my email to the new one
2019-01-28 21:39:22 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing
2019-01-27 15:20:16 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged
2019-01-27 10:49:34 +01:00
Laurent Destailleur
adb7ec7015
Merge pull request #10399 from grandoc/new_branch_23_01_2019
...
update with html5 compliant code
2019-01-26 14:02:26 +01:00
Philippe GRAND
7c086ba8ed
update with html5 compliant code
2019-01-24 10:02:06 +01:00
Philippe GRAND
1599f165ee
update with html5 compliant code
2019-01-24 09:57:39 +01:00
Philippe GRAND
7ff1555e58
update with html5 compliant code
2019-01-23 17:39:40 +01:00
Laurent Destailleur
300889f53a
# WARNING: head commit changed in the meantime
...
Fix
2019-01-19 13:22:38 +01:00
Laurent Destailleur
2bbaae88d6
Fix standardize 'createfromclone' param when cloning
2019-01-19 12:46:38 +01:00
Philippe GRAND
68c6ccae22
update with html5 compliant code
2019-01-18 10:06:45 +01:00
Laurent Destailleur
58bda12e22
css
2019-01-17 19:31:01 +01:00
Laurent Destailleur
8d4d1dbf99
Fix phpcs
2019-01-16 18:51:51 +01:00
atm-quentin
013c078c8b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice
2019-01-16 10:52:46 +01:00
Laurent Destailleur
d9999d61f6
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-09 12:27:25 +01:00
Laurent Destailleur
890abd28d5
Fix look and feel v9
2019-01-09 12:26:49 +01:00
ldestailleur
451b3e30cc
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/core/lib/functions.lib.php
htdocs/langs/en_US/cashdesk.lang
2019-01-04 19:36:20 +01:00
Alexandre SPANGARO
c4dbf41530
Look & feel
2018-12-30 21:21:40 +01:00
Laurent Destailleur
eb66d45947
Merge branch 'develop' into 10.0_accoutancy_stats
2018-12-15 15:17:15 +01:00
Laurent Destailleur
2011afe6fb
Merge branch 'develop' into actionrefused
2018-12-14 15:48:24 +01:00
Laurent Destailleur
611ccc4a9a
Merge branch 'develop' into fieldlabel
2018-12-14 15:42:01 +01:00
Laurent Destailleur
f97b561af0
Merge branch 'develop' into qual_rename_facnumber
2018-12-13 20:24:12 +01:00
Laurent Destailleur
21b3bbc2e6
Merge
2018-12-08 11:55:27 +01:00
Laurent Destailleur
a915d82883
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2018-12-08 11:42:30 +01:00
Laurent Destailleur
5ce26bae1b
Fix form of bank info for CH
2018-12-04 22:01:35 +01:00
Laurent Destailleur
275eeca135
Trans
2018-12-04 13:09:58 +01:00
Maxime Kohlhaas
2e496ea83a
QUAL rename facnumber by ref
2018-12-02 17:33:44 +01:00
Alexandre SPANGARO
088c002ed1
NEW: Add stats on entries & movements by fiscal year
2018-12-02 11:01:11 +01:00
Laurent Destailleur
ed1062c440
Css
2018-11-25 11:59:49 +01:00
atm-quentin
a0d5607ba5
FIX error travis
2018-11-16 15:29:05 +01:00
atm-quentin
c18f486179
set facture to invoice AND check invoicenumber conf
2018-11-16 11:20:03 +01:00
atm-quentin
e004fc2f5b
FIX block page if cant fetch
2018-11-16 11:17:34 +01:00
atm-quentin
a8ab666d62
remplacement en masse des $conf->entity par des getEntity('facture')
2018-11-16 11:17:18 +01:00
Frédéric FRANCE
12dcda7e02
Merge remote-tracking branch 'upstream/develop' into fieldlabel
2018-11-15 22:01:36 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused
2018-11-13 21:40:17 +01:00
Frédéric FRANCE
09efde4901
Merge remote-tracking branch 'upstream/develop' into fieldlabel
2018-11-09 18:13:59 +01:00
Regis Houssin
89389baeac
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email
2018-11-09 15:37:29 +01:00
Laurent Destailleur
66ffcf287a
Fix filter on extrafields
2018-11-07 12:49:17 +01:00
Laurent Destailleur
4a25317f10
Fix security on GETPOST('action'). Param must be sanitized.
2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e
FIX sanitize param $action
2018-11-05 17:53:31 +01:00
Frédéric FRANCE
fe5056add8
remove fieldlabel and add fieldeditkey
2018-10-27 18:07:05 +02:00
Frédéric FRANCE
42a9abad56
remove fieldlabel and add fieldeditkey
2018-10-27 17:45:29 +02:00
Regis Houssin
569d59d251
FIX change my deprecated email
2018-10-27 14:43:12 +02:00
Laurent Destailleur
087b68948d
Fix: do not use point for graph with too many points.
2018-10-26 17:32:32 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
2018-10-24 23:04:26 +02:00
Laurent Destailleur
01adaf253c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/product/list.php
2018-10-24 03:35:44 +02:00
Laurent Destailleur
f8316abfc0
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/theme/md/style.css.php
2018-10-24 02:58:29 +02:00
Laurent Destailleur
919c4fc5bc
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/theme/md/style.css.php
2018-10-24 02:40:57 +02:00
Laurent Destailleur
c8aa884462
Fix search all
2018-10-23 17:16:46 +02:00
Laurent Destailleur
99fde00902
Merge pull request #9719 from frederic34/patch-11
...
do not trim int
2018-10-12 17:35:04 +02:00
Laurent Destailleur
7f1aa217a6
Fix link
2018-10-10 18:38:53 +02:00
Laurent Destailleur
82e06eda75
FIX save search criteria when going on receipt from bank transaction
2018-10-10 18:33:32 +02:00
Laurent Destailleur
6446343e1b
Fix sort lost
2018-10-10 13:05:19 +02:00
Laurent Destailleur
cb29209457
NEW Enhancement in process to make manual bank conciliation
2018-10-10 12:47:18 +02:00
Laurent Destailleur
562ee1cb64
FIX checkbox to conciliate not visible if bank receipt nb known
2018-10-10 12:19:22 +02:00
Frédéric FRANCE
03fcc2f088
Update paymentvarious.class.php
2018-10-09 20:31:14 +02:00
Frédéric FRANCE
b917fd0cf2
do not trim int
2018-10-09 19:41:53 +02:00
Philippe GRAND
e9bd1be41b
Standardize and update code
2018-10-09 15:38:42 +02:00
Laurent Destailleur
dfe9c05d2f
Merge menu entry for tags/categories as submenu of element.
2018-10-09 15:26:15 +02:00
Laurent Destailleur
41add1c251
Standardize code
2018-10-04 19:19:29 +02:00
Laurent Destailleur
6fcb45cf40
Rename page various_payment/index.php into list.php (coding rule)
2018-10-04 19:10:39 +02:00
Laurent Destailleur
5034264d60
Debug / Standardize code
2018-10-04 18:27:49 +02:00
Laurent Destailleur
ebba33635b
Close #9674 by keeping old code present (this help for transition tests)
2018-10-04 18:20:57 +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
2f88f84e3b
Clean code
2018-09-28 22:13:42 +02:00
Philippe GRAND
15ff9f8917
Standardize and update code
2018-09-28 14:44:47 +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
803505b6b7
Standardize and update code
2018-09-20 12:27:06 +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
6291f18179
Merge pull request #9440 from frederic34/patch-5
...
Upper Lower Casing
2018-09-12 18:24:02 +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
Frédéric FRANCE
a558c3bdac
replace select_date
2018-09-09 11:25:59 +02:00
Frédéric FRANCE
b2a58067d9
replace select_date
2018-09-09 09:56:33 +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
2b62c4ca8f
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-08 10:50:27 +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
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
04c1a7d4af
move phpcs:ignore
2018-09-02 13:38:11 +02:00
Philippe GRAND
c4f05aff28
Standardize and update code
2018-09-02 10:42:31 +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
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
edaa575435
Standardize and update code
2018-08-31 18:36:15 +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
Philippe GRAND
88ad651743
Fix white spaces
2018-08-29 12:26:47 +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
Laurent Destailleur
7219bac0b2
Merge pull request #9168 from frederic34/trimtrailing
...
Trimtrailing
2018-08-28 02:30:02 +02:00
Philippe GRAND
2fa82edd39
Standardize and update code
2018-08-23 17:07:27 +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
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
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
Frédéric FRANCE
39462742e2
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-16 08:17:55 +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
Frédéric FRANCE
69a7af88e7
function declaration
2018-08-15 18:14:02 +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
Frédéric FRANCE
6f74ecceaf
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 18:21:59 +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
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
37a9a2df56
Merge pull request #9167 from frederic34/include
...
Include and co are statements
2018-08-02 11:03: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
Philippe GRAND
2a6f050e32
Clean and update code
2018-07-24 18:28:56 +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
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
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
Inovea Conseil
30cff2bb36
ADD check user's rights
2018-07-05 11:52:41 +02:00
Laurent Destailleur
27a27e02a1
Fix css
2018-06-22 22:53:53 +02:00
Laurent Destailleur
9717a32a2e
Merge pull request #8960 from grandoc/new_branch_13_06_2018
...
clean code
2018-06-14 12:01:19 +02:00
Laurent Destailleur
4a5fd35e11
Look and feel v8
2018-06-13 22:57:41 +02:00
Philippe GRAND
a937d9e657
clean code
2018-06-13 22:52:24 +02:00
Papoteur
6567365086
In list of bank accounts, display the balance in formatted price
...
[Problem to solve]
in compta/bank/list.php, the balance can be displayed witht decimal or not. This is not fine.
[Solution]
Change a parameter in the price function to format the balance with the required number of decimals.
2018-06-13 08:39:26 +02:00
Frédéric FRANCE
84f2b31d46
loadlangs
2018-05-27 09:40:17 +02:00
Laurent Destailleur
546da0ceda
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/core/modules/modStock.class.php
htdocs/product/inventory/list.php
2018-05-05 14:40:39 +02:00
Laurent Destailleur
3340598cf8
FIX Projet is not prefilled when created from overwiew page
2018-05-01 14:15:11 +02:00
Laurent Destailleur
2fc2c44de4
Fix phpcs
2018-04-29 20:18:50 +02:00
Laurent Destailleur
e72c2e6a11
Enhance sorting of field for lists on field with several sort criterias
2018-04-28 19:54:41 +02:00
Laurent Destailleur
32511422ab
Fix PSR2
2018-04-22 20:08:29 +02:00
Laurent Destailleur
ac89951acd
Merge pull request #8647 from fmarcet/develop
...
New: Add same parameters on 'printFieldListTitle' hooks
2018-04-22 19:35:09 +02:00
Laurent Destailleur
69adf73f4f
Clean code from $var = True
2018-04-22 19:27:37 +02:00
Laurent Destailleur
ccd9aa8059
Fight against dolibarr warnings
2018-04-21 12:16:12 +02:00
Ferran Marcet
6ced1a3264
New: Add same parameters on 'printFieldListTitle' hooks
2018-04-20 10:38:16 +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
69c26e19a8
NEW Can edit the text color for title line of tables
2018-04-15 22:01:52 +02:00
Laurent Destailleur
8fbde88872
Look and feel v8
2018-04-15 17:37:49 +02:00
Laurent Destailleur
be965bdbab
Clean code
2018-04-13 13:28:48 +02:00
Laurent Destailleur
1521b0595b
Clean code
2018-04-13 11:03:03 +02:00
Laurent Destailleur
6e288fca75
Merge pull request #8575 from all3kcis/develop-patch-16
...
NEW Add files management on products lot
2018-04-13 00:57:13 +02:00
All-3kcis
880fa55dd5
display user-friendly filesize
2018-04-12 15:29:22 +02:00
Laurent Destailleur
ea2fd67e0d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/card.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/langs/de_DE/admin.lang
2018-04-12 13:31:14 +02:00
Laurent Destailleur
590bc2948a
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/compta/bank/card.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
2018-04-11 17:20:49 +02:00
Laurent Destailleur
628b437e28
Update card.php
2018-04-11 16:25:05 +02:00
Laurent Destailleur
9af052602a
Fix css
2018-04-11 12:54:57 +02:00
atm-arnaud
848d76ee78
FIX #8023
2018-04-10 14:43:32 +02:00
Laurent Destailleur
54a86dc2b1
Fix CSS
2018-04-09 11:42:43 +02:00
Laurent Destailleur
0475cb8018
FIX Permission for bookkeeper
2018-04-09 10:51:58 +02:00
Laurent Destailleur
0c0f950338
Look and feel
2018-04-09 00:03:13 +02:00
Laurent Destailleur
cfa667f9df
Fix rounding in data shown
2018-04-09 00:01:15 +02:00
