Frédéric FRANCE
|
269e53583d
|
doxygen
|
2019-12-11 23:46:12 +01:00 |
|
Frédéric FRANCE
|
66805a502a
|
doxygen
|
2019-12-11 22:53:57 +01:00 |
|
Frédéric FRANCE
|
c98ab917dd
|
doxygen
|
2019-12-11 20:33:58 +01:00 |
|
Laurent Destailleur
|
5454380834
|
CSS
|
2019-12-11 19:14:41 +01:00 |
|
Frédéric FRANCE
|
307bad1d2a
|
doxygen todo
|
2019-12-11 19:11:13 +01:00 |
|
Laurent Destailleur
|
738526e77e
|
Fix br
|
2019-12-10 14:04:50 +01:00 |
|
Laurent Destailleur
|
fe44d3a4fa
|
FIX #12674
|
2019-12-10 14:02:03 +01:00 |
|
Laurent Destailleur
|
2d97c0bb79
|
Try better fix for #12674
|
2019-12-10 13:55:45 +01:00 |
|
Laurent Destailleur
|
a77dc75bd4
|
Merge branch 'develop' into NEW_10.0_card_of_bill_created_from_template__add_link_to_template
|
2019-12-09 16:05:23 +01:00 |
|
Laurent Destailleur
|
2fd6c690c0
|
Merge pull request #12632 from atm-florianm/FIX_10.0_restore_filter_values_when_returning_to_list_from_card
FIX 10.0: add URL param "restore_last_search_values=1" to all backlinks pointing to lists
|
2019-12-09 15:59:55 +01:00 |
|
Laurent Destailleur
|
f28e4c14e8
|
FIX #12644
|
2019-12-09 13:40:26 +01:00 |
|
Laurent Destailleur
|
0a3b2987d1
|
Merge pull request #12657 from frederic34/patch-19
doxygen
|
2019-12-09 10:47:16 +01:00 |
|
Laurent Destailleur
|
eb0d20b77e
|
Fix label of country
Fix div empty
|
2019-12-09 09:16:59 +01:00 |
|
Frédéric FRANCE
|
c05ba624ce
|
Update deplacement.class.php
|
2019-12-08 22:46:22 +01:00 |
|
Frédéric FRANCE
|
3db84df60e
|
Update card.php
|
2019-12-08 22:45:10 +01:00 |
|
Frédéric FRANCE
|
6c5629b5a5
|
Update deplacement.class.php
|
2019-12-08 22:39:33 +01:00 |
|
Frédéric FRANCE
|
49f22facef
|
doxygen
|
2019-12-08 22:37:19 +01:00 |
|
Florian Mortgat
|
6227d14cf3
|
NEW 10.0: link to template of origin in bill cards for bills created from a template
|
2019-12-06 13:48:24 +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 |
|
Laurent Destailleur
|
93d66d8213
|
Debug v11
|
2019-12-06 08:50:26 +01:00 |
|
Frédéric FRANCE
|
d9bfa62367
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-12-05 21:47:42 +01:00 |
|
Florian Mortgat
|
3f6715a377
|
FIX: add URL param "restore_last_search_values=1" to all backlinks that point to a list
|
2019-12-05 15:34:41 +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 |
|
Laurent Destailleur
|
6f7343b14f
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-12-02 11:01:26 +01:00 |
|
Laurent Destailleur
|
6d81bc77cb
|
Fix look and feel v11
|
2019-12-02 11:00:09 +01:00 |
|
Laurent Destailleur
|
92070fa491
|
Fix name of variable $trigger_name into $triggersendname
|
2019-12-02 09:38:16 +01:00 |
|
Frédéric FRANCE
|
25ed2b930f
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-12-01 16:10:37 +01:00 |
|
Laurent Destailleur
|
3eec2430eb
|
Merge pull request #12585 from atm-john/develop_factoring_token_usage
Factoring token usage
|
2019-12-01 11:37:30 +01:00 |
|
Laurent Destailleur
|
790fdc881c
|
# WARNING: head commit changed in the meantime
Restore file for travis
|
2019-12-01 10:50:56 +01:00 |
|
Laurent Destailleur
|
6bf3af5d83
|
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0
Conflicts:
htdocs/compta/tva/index.php
htdocs/core/lib/pdf.lib.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php
|
2019-12-01 10:30:22 +01:00 |
|
ATM John BOTELLA
|
773f823748
|
factoring token usage
|
2019-12-01 10:20:11 +01:00 |
|
Laurent Destailleur
|
1d564c2a39
|
Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
Conflicts:
htdocs/core/class/notify.class.php
|
2019-12-01 00:58:01 +01:00 |
|
Laurent Destailleur
|
199b0c11af
|
Merge pull request #12572 from atm-maxime/fix_deposit
Fix deposit line was not translated in deposit invoice
|
2019-12-01 00:44:17 +01:00 |
|
Maxime Kohlhaas
|
3c639772d9
|
Fix #11228 : VAT dates regarding fiscal year
|
2019-11-30 17:16:16 +01:00 |
|
Maxime Kohlhaas
|
558669dd88
|
Fix #6497 : deposit lines were not translated
|
2019-11-30 16:14:16 +01:00 |
|
Laurent Destailleur
|
6944b67b1e
|
Merge pull request #12548 from frederic34/patch-8
functions return void
|
2019-11-30 01:25:04 +01:00 |
|
Frédéric FRANCE
|
6d8c59991d
|
doxygen
|
2019-11-28 23:21:42 +01:00 |
|
Frédéric FRANCE
|
06839e9a7f
|
functions return void
|
2019-11-28 22:34:53 +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 |
|
Laurent Destailleur
|
8430ec4f50
|
Merge pull request #12534 from aspangaro/11.0_a8
Look & Feel v11
|
2019-11-28 12:18:39 +01: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
|
659e3aca8e
|
Look & field v11
|
2019-11-26 21:14:44 +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 |
|
Scrutinizer Auto-Fixer
|
e36ee63ab6
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-22 13:16:38 +00:00 |
|
Laurent Destailleur
|
f9092b1b8e
|
Fix responsive
|
2019-11-20 13:22:40 +01:00 |
|
Frédéric FRANCE
|
d182eee4bf
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-19 23:26:00 +01:00 |
|
Laurent Destailleur
|
fb70893229
|
Fix missing class reposition
|
2019-11-19 21:29:49 +01:00 |
|
Laurent Destailleur
|
07c01a821e
|
FIx #12466 manually (conflict pb)
|
2019-11-19 19:43:02 +01:00 |
|
Laurent Destailleur
|
5d7a1f1265
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/contact/card.php
htdocs/core/class/extrafields.class.php
htdocs/langs/en_US/stocks.lang
|
2019-11-19 19:02:14 +01:00 |
|
Laurent Destailleur
|
2f3b4d239b
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2019-11-19 18:56:12 +01:00 |
|
Laurent Destailleur
|
5b6f0cb101
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/class/extrafields.class.php
|
2019-11-18 21:19:10 +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 |
|
Scrutinizer Auto-Fixer
|
eba082320c
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-16 22:25:24 +00: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 |
|
Laurent Destailleur
|
8db4eff108
|
Merge pull request #12437 from Dolibarr/scrutinizer-patch-8
Scrutinizer Auto-Fixes
|
2019-11-14 12:10:44 +01:00 |
|
Scrutinizer Auto-Fixer
|
f197196719
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-14 11:09:46 +00:00 |
|
gauthier
|
a5635825f3
|
FIX : wrong invoice id for fetchObjetctLinked
|
2019-11-14 12:09:32 +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
|
c66bce7ec6
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 17:31:18 +00:00 |
|
Laurent Destailleur
|
4340f85e3c
|
Add warning
|
2019-11-13 01:22:13 +01:00 |
|
Laurent Destailleur
|
453ffad9e8
|
Look and feel v11
|
2019-11-12 18:01:16 +01:00 |
|
Laurent Destailleur
|
2a67dd0f66
|
Look and feel v11
|
2019-11-12 17:43:27 +01:00 |
|
Laurent Destailleur
|
e79ac7081a
|
Look and feel v11
|
2019-11-12 17:37:05 +01:00 |
|
Laurent Destailleur
|
3430a88c72
|
Fix $conf not defined
|
2019-11-12 10:13:22 +01:00 |
|
Laurent Destailleur
|
c02cd80b75
|
Clean code
|
2019-11-12 10:11:30 +01: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 |
|
stickler-ci
|
fae5d56d34
|
Fixing style errors.
|
2019-11-10 10:04:11 +00:00 |
|
Philippe GRAND
|
b0d68a6de1
|
add some comment
|
2019-11-10 11:05:30 +01:00 |
|
stickler-ci
|
4dda9edeb6
|
Fixing style errors.
|
2019-11-10 10:01:28 +00:00 |
|
Philippe GRAND
|
f960191671
|
add some comment
|
2019-11-10 11:02:44 +01:00 |
|
Alexandre SPANGARO
|
86b90b115f
|
NEW Invoice list - Add date start & date end
|
2019-11-09 05:20:13 +01:00 |
|
Laurent Destailleur
|
89ecd6a72a
|
Merge pull request #12389 from Dolibarr/scrutinizer-patch-5
Scrutinizer Auto-Fixes
|
2019-11-08 15:53:57 +01:00 |
|
Laurent Destailleur
|
4fce0d3e7a
|
Fix not transversable
|
2019-11-08 15:52:57 +01:00 |
|
Scrutinizer Auto-Fixer
|
812d0af1d9
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-08 14:51:54 +00: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
|
ba1f4f0ac6
|
Fix look and feel v11
|
2019-11-07 16:40:59 +01: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
|
c7e261a973
|
FIX #11907
|
2019-11-07 14:40:26 +01:00 |
|
Laurent Destailleur
|
5a4a421a8e
|
FIX #12372
|
2019-11-07 13:07:40 +01:00 |
|
Laurent Destailleur
|
cd5c359b83
|
Fix regression
|
2019-11-07 12:53:26 +01:00 |
|
Laurent Destailleur
|
4c44f3c109
|
Merge pull request #12366 from aspangaro/11.0_a3
NEW VAT list - Add date start & date end
|
2019-11-07 11:53:16 +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 |
|
Alexandre SPANGARO
|
fd45eeab83
|
NEW VAT list - Add date start & date end
|
2019-11-07 08:34:06 +01:00 |
|
Alexandre SPANGARO
|
e60b7a67fa
|
NEW Invoice list - Add date start & date end
|
2019-11-07 06:35:58 +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 |
|
Laurent Destailleur
|
94bd0f71d9
|
Fix pb with permission
|
2019-11-05 19:41:30 +01:00 |
|
Laurent Destailleur
|
17d5c385ff
|
FIX #12320 It is clearer that you can't change thirdparty when creating
invoice from template with a recurring rule.
|
2019-11-05 15:46:48 +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 |
|
Frédéric FRANCE
|
3a729f9e7b
|
fix missing newtoken in form
|
2019-11-04 22:45:20 +01:00 |
|
Laurent Destailleur
|
a8b1a75ea3
|
Merge pull request #12325 from frederic34/patch-6
fix indent in card-rec.php
|
2019-11-04 21:11:34 +01:00 |
|
Laurent Destailleur
|
e61f28ed17
|
Merge pull request #12318 from grandoc/new_branch_04_11_2019
fix translation
|
2019-11-04 20:50:58 +01:00 |
|
Frédéric FRANCE
|
ac783b303d
|
Update card-rec.php
|
2019-11-04 20:47:25 +01:00 |
|
Laurent Destailleur
|
e60fff39d9
|
Fix phpcs
|
2019-11-04 20:36:55 +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 |
|
stickler-ci
|
4480d7dd88
|
Fixing style errors.
|
2019-11-04 14:09:43 +00:00 |
|
Philippe GRAND
|
2909f8141e
|
fix translation
|
2019-11-04 15:08:43 +01:00 |
|
Laurent Destailleur
|
99a4781a42
|
Fix better support for multicurrency for template invoices
|
2019-11-03 18:58:26 +01:00 |
|
Laurent Destailleur
|
630a150b09
|
Fix multicurrency rate must be visible if currency differs only
|
2019-11-03 17:48:16 +01:00 |
|
Laurent Destailleur
|
6f82c212a0
|
Finished migration to the new architecture of extrafields
|
2019-11-02 17:38:19 +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
|
6348227698
|
Merge pull request #12275 from frederic34/patch-8
css
|
2019-11-02 13:31:18 +01:00 |
|
Laurent Destailleur
|
d232b7a387
|
Merge pull request #12286 from grandoc/new_branch_01_11_2019
add some comment
|
2019-11-02 13:00:23 +01:00 |
|
Laurent Destailleur
|
45c77b4560
|
Renaming some libelle into label
|
2019-11-02 12:59:38 +01:00 |
|
Laurent Destailleur
|
25e64b0610
|
Merge branch 'develop' into socid
|
2019-11-02 12:01:06 +01:00 |
|
Laurent Destailleur
|
c12e66e2a2
|
Merge branch 'develop' into new_branch_01_11_2019
|
2019-11-02 12:00:04 +01:00 |
|
Laurent Destailleur
|
68c971a2b5
|
All properties 'type_libelle' were renamed into 'type_label'.
|
2019-11-02 11:12:57 +01:00 |
|
Laurent Destailleur
|
82bda63920
|
Merge pull request #12296 from frederic34/patch-20
Update index.php
|
2019-11-02 10:09:55 +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
|
dbed10a701
|
Merge remote-tracking branch 'upstream/develop' into socid
|
2019-11-01 21:39:20 +01:00 |
|
Laurent Destailleur
|
2d9135b6ad
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/expedition/card.php
htdocs/holiday/list.php
|
2019-11-01 21:06:06 +01:00 |
|
Frédéric FRANCE
|
8b98df296f
|
Update info.php
|
2019-11-01 17:36:11 +01:00 |
|
Frédéric FRANCE
|
6dd8e7152c
|
Update index.php
|
2019-11-01 17:31:34 +01:00 |
|
Frédéric FRANCE
|
38b86d4bde
|
Update payments.php
|
2019-11-01 17:30:49 +01:00 |
|
Frédéric FRANCE
|
61873aa1a8
|
Update list.php
|
2019-11-01 17:29:21 +01:00 |
|
Frédéric FRANCE
|
5314ff70f5
|
Update index.php
in class ref and rowid are the same, lib is deprecated and is label
|
2019-11-01 17:26:53 +01:00 |
|
Laurent Destailleur
|
e3b5be7475
|
All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
|
2019-11-01 12:52:03 +01:00 |
|
Philippe Grand
|
9fad5dc8fc
|
Update chargesociales.class.php
|
2019-11-01 11:16:47 +01:00 |
|
Philippe Grand
|
f568241a81
|
Update cashcontrol.class.php
|
2019-11-01 11:16:20 +01:00 |
|
stickler-ci
|
0c6938aa2a
|
Fixing style errors.
|
2019-11-01 09:44:29 +00:00 |
|
Philippe GRAND
|
4fe3e49502
|
add some comment
|
2019-11-01 10:42:14 +01:00 |
|
Laurent Destailleur
|
a0e377feb3
|
Look and feel v11
|
2019-10-31 22:11:26 +01:00 |
|
Laurent Destailleur
|
a1700e71be
|
Fix phpcs
|
2019-10-31 21:18:38 +01:00 |
|
Frédéric FRANCE
|
e93aaa2a75
|
replace deprecated user->societe_id by user->socid
|
2019-10-31 20:46:31 +01:00 |
|
Laurent Destailleur
|
607c38775d
|
Use popup
|
2019-10-31 14:57:05 +01:00 |
|
Laurent Destailleur
|
360b3a9550
|
NEW Ask the new label and new dates in confirm popup when cloning tax
|
2019-10-31 14:06:26 +01:00 |
|
Frédéric FRANCE
|
f202424432
|
css
|
2019-10-30 18:52:54 +01:00 |
|
Laurent Destailleur
|
923ab59e4e
|
Merge pull request #12219 from frederic34/patch-7
css
|
2019-10-30 03:13:14 +01:00 |
|
Laurent Destailleur
|
8849cd9897
|
Update index.php
|
2019-10-30 02:19:32 +01:00 |
|
Alexandre SPANGARO
|
db86dff7d1
|
Fix sign for VAT repaid in report
|
2019-10-29 17:10:10 +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 |
|
Frédéric FRANCE
|
99b338b468
|
Update index.php
|
2019-10-24 23:09:58 +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 |
|
Laurent Destailleur
|
9be9f912af
|
Merge pull request #12192 from Ahuahuachi/develop
Translate documentation and minor code improvement
|
2019-10-22 12:32:40 +02:00 |
|
Alfredo Altamirano
|
f2e5a23547
|
Declaration of $soc should not be conditional
|
2019-10-20 13:47:39 -05:00 |
|
Frédéric FRANCE
|
86f22c4563
|
do not ignore lines with mix od tabs and spaces
|
2019-10-20 17:17:22 +02:00 |
|
Laurent Destailleur
|
5a4960f7ae
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
htdocs/takepos/takepos.php
|
2019-10-20 15:30:28 +02:00 |
|
Frédéric FRANCE
|
a16b7bcda6
|
cut long lines
|
2019-10-19 19:16:28 +02:00 |
|
Laurent Destailleur
|
78ac543dee
|
Fix link to list
|
2019-10-18 20:01:47 +02:00 |
|
Laurent Destailleur
|
f85899742b
|
Merge pull request #12153 from frederic34/Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-17 17:48:42 +02:00 |
|
Laurent Destailleur
|
f7782873a5
|
Look and feel v11
|
2019-10-17 15:58:24 +02:00 |
|
Laurent Destailleur
|
c58a006703
|
NEW Show POS application and terminal on invoice card.
|
2019-10-17 15:56:50 +02:00 |
|
Laurent Destailleur
|
5e12dcc6b1
|
Fix on FACTURE_ENABLE_NEGATIVE
|
2019-10-17 15:40:02 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Laurent Destailleur
|
b9ec45fd49
|
Clean code
|
2019-10-16 14:02:13 +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 |
|
Laurent Destailleur
|
1f672221ec
|
Merge pull request #12106 from frederic34/patch-13
avoid ErrorBadValueForParamNotAString if not configured
|
2019-10-14 20:55:06 +02:00 |
|
Laurent Destailleur
|
5d02763288
|
Merge pull request #12129 from cyrilus/develop
ADD option MAIN_DONT_KEEP_NOTE_ON_CLONING to remove note on cloning
|
2019-10-14 20:39:08 +02:00 |
|
Laurent Destailleur
|
dbdc62b028
|
Fix td
|
2019-10-14 18:41:46 +02:00 |
|
stickler-ci
|
4b7987374b
|
Fixing style errors.
|
2019-10-14 14:46:04 +00:00 |
|
Laurent Destailleur
|
dba9450b01
|
css
|
2019-10-14 16:03:12 +02:00 |
|
Laurent Destailleur
|
28339920b3
|
Translation
|
2019-10-14 16:00:03 +02:00 |
|
Laurent Destailleur
|
323f31d832
|
Trans frequency
|
2019-10-13 20:54:00 +02:00 |
|
Laurent Destailleur
|
f91b98d326
|
Add frequency in template invoice popup
|
2019-10-13 20:50:03 +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 |
|
Frédéric FRANCE
|
9f59656589
|
fix typo inspired by grandoc
|
2019-10-11 23:08:33 +02:00 |
|
Laurent Destailleur
|
78bfc8997d
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/link.class.php
|
2019-10-11 16:14:29 +02:00 |
|
Laurent Destailleur
|
d052e4f323
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/link.class.php
|
2019-10-11 16:13:26 +02:00 |
|
Laurent Destailleur
|
fc9c343af9
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/core/class/link.class.php
|
2019-10-11 16:12:01 +02:00 |
|
Laurent Destailleur
|
777c297353
|
FIX #12054
|
2019-10-11 15:42:27 +02:00 |
|
ro@t.com
|
2149b155d1
|
ADD option MAIN_DONT_KEEP_NOTE_ON_CLONING to remove note on cloning
|
2019-10-10 15:57:26 +02:00 |
|
Laurent Destailleur
|
b34cbfad74
|
Rename const
|
2019-10-10 15:23:45 +02:00 |
|
Laurent Destailleur
|
015d51c169
|
NEW Add column of module source and POS terminal in invoice list.
|
2019-10-10 15:10:41 +02:00 |
|
Laurent Destailleur
|
b6c600c171
|
css
|
2019-10-10 11:44:03 +02:00 |
|
Frédéric FRANCE
|
0c8331b6d7
|
doxygen
|
2019-10-09 18:47:25 +02:00 |
|
Laurent Destailleur
|
dcc4fa6a64
|
Merge branch 'develop' into patch-255
|
2019-10-08 19:37:42 +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 |
|
Laurent Destailleur
|
b883a8092a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/product.lib.php
htdocs/core/tpl/extrafields_list_search_input.tpl.php
htdocs/fourn/facture/card.php
htdocs/product/class/html.formproduct.class.php
|
2019-10-05 19:35:40 +02:00 |
|
Laurent Destailleur
|
0b9d27423d
|
FIX Can't modify vendor invoice if transfered into accountancy
|
2019-10-04 10:31:57 +02:00 |
|
Laurent Destailleur
|
6cd3d27885
|
Fix comparison
|
2019-10-04 09:54:52 +02:00 |
|
Alexandre SPANGARO
|
14381927c7
|
Fix Bank Fa-icon
|
2019-10-03 20:32:15 +02:00 |
|
Laurent Destailleur
|
1a66e0b05e
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/product/card.php
|
2019-10-03 17:53:59 +02:00 |
|
Laurent Destailleur
|
24570f7165
|
Look and feel v11. Picto are fontawesome.
|
2019-10-02 18:14:41 +02:00 |
|
Laurent Destailleur
|
b79831ec39
|
Merge pull request #11952 from aspangaro/11.0_https
Move Gnu.org to https
|
2019-10-01 14:48:21 +02:00 |
|
Laurent Destailleur
|
1c92c2d8bc
|
Merge pull request #11993 from frederic34/patch-12
Update chargesociales.class.php for doxygen
|
2019-10-01 11:15:45 +02:00 |
|
Alexandre SPANGARO
|
16c6c9ae75
|
Merge remote-tracking branch 'upstream/develop' into 11.0_https
|
2019-10-01 06:12:24 +02:00 |
|
Alexandre SPANGARO
|
91b3bf76fd
|
Merge branch 'develop' into 11.0_https
|
2019-10-01 06:11:43 +02:00 |
|
Frédéric FRANCE
|
3ba48fde93
|
Update api_invoices.class.php
|
2019-09-30 21:44:37 +02:00 |
|
Frédéric FRANCE
|
ea008aefd7
|
Update chargesociales.class.php
|
2019-09-30 20:21:10 +02:00 |
|
Frédéric FRANCE
|
0c908fb4ed
|
Update chargesociales.class.php
|
2019-09-30 20:13:43 +02:00 |
|
Laurent Destailleur
|
14f7e48fe5
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-09-30 18:50:33 +02:00 |
|
Laurent Destailleur
|
a56b9e1ca9
|
The trigger BON_PRELEVEMENT has been renamed into
DIRECT_DEBIT_ORDER_CREATE.
|
2019-09-30 18:50:23 +02:00 |
|
Laurent Destailleur
|
cff8f582e7
|
Update bonprelevement.class.php
|
2019-09-30 18:47:18 +02:00 |
|
Laurent Destailleur
|
9d5b84ec44
|
Merge branch 'develop' into fix_9.0_withdraw_trigger_create_missing
|
2019-09-30 18:39:46 +02:00 |
|
Laurent Destailleur
|
2da5a506a9
|
Update facture.class.php
|
2019-09-30 18:25:03 +02:00 |
|
Laurent Destailleur
|
564e22009d
|
Update facture.class.php
|
2019-09-30 18:22:37 +02:00 |
|
Laurent Destailleur
|
4f356fa412
|
Merge pull request #11859 from altatof/avoir
FIX : allow standalone credit note even if no invoice
|
2019-09-30 18:12:55 +02:00 |
|
Laurent Destailleur
|
945dd0ae89
|
Update card.php
|
2019-09-30 18:12:43 +02:00 |
|
Laurent Destailleur
|
b28cd1bb57
|
Merge pull request #11972 from aspangaro/11.0_fa_icon
NEW Add fa_icon on load_fiche_titre
|
2019-09-30 15:26:28 +02:00 |
|
Alexandre SPANGARO
|
aec50d3ac9
|
NEW Add fa_icon on load_fiche_titre
|
2019-09-30 10:14:55 +02:00 |
|
ptibogxiv
|
4177c72ae0
|
Update facture.class.php
|
2019-09-29 15:46:28 +02:00 |
|
ptibogxiv
|
2e8b99606e
|
Update facture.class.php
|
2019-09-29 15:45:41 +02:00 |
|
ptibogxiv
|
5a096972c0
|
Update list.php
|
2019-09-29 15:42:39 +02:00 |
|
Laurent Destailleur
|
6966651d51
|
Standardize code to use dolSqlDateFilter
|
2019-09-28 13:22:05 +02:00 |
|
Alexandre SPANGARO
|
288aea190b
|
Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon
|
2019-09-28 06:09:40 +02:00 |
|
Alexandre SPANGARO
|
7f93f046e9
|
NEW Add fa_icon on load_fiche_titre
|
2019-09-28 06:02:25 +02:00 |
|
Laurent Destailleur
|
07b555b965
|
Merge branch 'develop' into patch-255
|
2019-09-27 15:23:15 +02:00 |
|
Laurent Destailleur
|
f5c839217a
|
Merge pull request #11914 from fmarcet/develop
Fix: Load invoices only if showed
|
2019-09-27 14:34:16 +02:00 |
|
Laurent Destailleur
|
f3bc319a78
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/takepos/takepos.php
|
2019-09-27 14:11:14 +02:00 |
|
Laurent Destailleur
|
6d1a571aed
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/product/dynamic_price/class/price_parser.class.php
|
2019-09-27 14:07:11 +02:00 |
|
Laurent Destailleur
|
5d45638248
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-09-27 14:02:23 +02:00 |
|
Laurent Destailleur
|
6858dce344
|
Rename table for categorie of warehouses
|
2019-09-27 13:28:28 +02:00 |
|
Alexandre SPANGARO
|
e38bb89a2e
|
NEW Add fa_icon on load_fiche_titre
|
2019-09-27 11:48:40 +02:00 |
|
Laurent Destailleur
|
99cfea1ff4
|
Update paiement_charge.php
|
2019-09-27 11:34:50 +02:00 |
|
Alexandre SPANGARO
|
b52e5d51e3
|
FIX colspan on VAT quadri report
|
2019-09-26 22:01:59 +02:00 |
|
Ferran Marcet
|
a8cc11d232
|
Merge branch 'developup' into develop
|
2019-09-24 13:38:11 +02:00 |
|
Alexandre SPANGARO
|
1b099733f5
|
Merge remote-tracking branch 'upstream/develop' into 11.0_translation
|
2019-09-24 08:42:57 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
Alexandre SPANGARO
|
1c13a38ce9
|
Typo abscissa
|
2019-09-23 21:45:23 +02:00 |
|
Alexandre SPANGARO
|
e32772fdc5
|
Translate
|
2019-09-20 09:44:49 +02:00 |
|
gauthier
|
575e4d11d0
|
FIX : wrong test
|
2019-09-19 17:28:51 +02:00 |
|
Laurent Destailleur
|
a43253eab8
|
Fix for deposit not correctly closed
|
2019-09-17 18:49:56 +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 |
|
Ferran Marcet
|
3f25a8d8d5
|
New: Load invoices only if showed
|
2019-09-17 09:38:08 +02:00 |
|
Ferran Marcet
|
e4984492b3
|
Dejarlo igual que develop
|
2019-09-17 09:32:43 +02:00 |
|
Ferran Marcet
|
c48fc3a2cf
|
Merge branch 'developup' into develop
# Conflicts:
# htdocs/compta/facture/fiche-rec.php
# htdocs/install/mysql/migration/9.0.0-10.0.0.sql
|
2019-09-17 09:27:42 +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
|
56a99f6e6d
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-09-12 11:22:13 +02:00 |
|
Laurent Destailleur
|
3f3282400a
|
FIX SQL syntax error and CSRF check on vat reports
|
2019-09-11 13:57:15 +02:00 |
|
Christophe Battarel
|
c8cb5886f4
|
correction
|
2019-09-10 17:04:09 +02:00 |
|
Christophe Battarel
|
95417d4c86
|
allow standalone credit note even if no invoice
|
2019-09-10 16:24:04 +02:00 |
|
Laurent Destailleur
|
61cf47aa16
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-09-10 00:14:07 +02:00 |
|
Laurent Destailleur
|
1d74387125
|
Removed deprecated property ->numero (We must use ->num_payment)
|
2019-09-09 08:47:23 +02:00 |
|
Laurent Destailleur
|
cad9a59d2a
|
Add option to be able to find behaviour before the fix of list of
invoice in direct debit order.
|
2019-09-06 14:45:55 +02:00 |
|
Laurent Destailleur
|
09d6826e62
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/supplier_order.php
htdocs/langs/en_US/admin.lang
|
2019-09-06 14:27:01 +02:00 |
|
Laurent Destailleur
|
bc0b8dfad0
|
FIX Consistency in direct debit order lists.
FIX Confirmation of deletion
|
2019-09-06 14:24:33 +02:00 |
|
Laurent Destailleur
|
bc7bf3b4b5
|
FIX bad consistency in list of invoice for direct debit order.
|
2019-09-06 13:44:02 +02:00 |
|
Laurent Destailleur
|
d1a5be20ea
|
Fix wrong warning
|
2019-09-06 13:02:52 +02:00 |
|
ptibogxiv
|
5d81b0271d
|
Update facture.class.php
|
2019-09-06 11:40:26 +02:00 |
|
ptibogxiv
|
fc75d72290
|
Update list.php
|
2019-09-06 11:35:52 +02:00 |
|
Laurent Destailleur
|
529dd05226
|
Replace deprecated code
|
2019-09-06 10:53:05 +02:00 |
|
Laurent Destailleur
|
bb81f66a1a
|
Add phpunit test for Lessc
|
2019-09-06 10:36:49 +02:00 |
|
Laurent Destailleur
|
92e7d7bb26
|
Fix duplicate translation
|
2019-09-05 16:18:20 +02:00 |
|
atm-ph
|
f7fe3d2842
|
Fix set var in context attribute instead of object attribute
|
2019-09-04 16:30:55 +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 |
|
Laurent Destailleur
|
28c4f86c79
|
Fix regression
|
2019-09-03 16:23:39 +02:00 |
|
Laurent Destailleur
|
33cb9f7df4
|
Merge pull request #11776 from OPEN-DSI/fix-facture-duedate-and-paid
FIX set due date in object in create invoice and set default paid in …
|
2019-09-03 15:21:19 +02:00 |
|
Frédéric FRANCE
|
32343fba24
|
Optimize invoice situation doc
with many many lines, it can be very very long to generate pdf
|
2019-09-03 13:43:44 +02:00 |
|
Laurent Destailleur
|
98459363df
|
Merge pull request #11795 from jtraulle/fix-doxygen-examples
Fix Wrongly catched examples by Doxygen
|
2019-09-03 12:45:23 +02:00 |
|
Laurent Destailleur
|
a269082d70
|
Replace deprecated code with new one
|
2019-09-02 03:58:00 +02:00 |
|
Laurent Destailleur
|
f2af28f0e1
|
Clean code
|
2019-08-31 02:08:26 +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 |
|
Jean Traullé
|
c32c7d48ba
|
Fix Wrongly catched examples by Doxygen
|
2019-08-30 17:14:59 +02:00 |
|
Laurent Destailleur
|
05c9e97fe4
|
The deprecated method get_OutstandingBill has been removed. You can use
getOutstandingBills() instead.
|
2019-08-29 00:45:02 +02:00 |
|
VESSILLER
|
877867a6c2
|
FIX set due date in object in create invoice and set default paid in update invoice
|
2019-08-28 13:50:39 +02:00 |
|
atm-ph
|
5aa27a126a
|
Fix trigger create on widthdraw is missing
|
2019-08-28 13:45:02 +02:00 |
|
Laurent Destailleur
|
e421b4b698
|
Trans
|
2019-08-28 10:12:39 +02:00 |
|
Laurent Destailleur
|
4b5d9e44b2
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-08-26 22:47:33 +02:00 |
|
Laurent Destailleur
|
45ff873064
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/compta/paiement.php
htdocs/core/class/html.form.class.php
|
2019-08-26 22:44:49 +02:00 |
|
Laurent Destailleur
|
f07d99ed9a
|
Merge pull request #11730 from atm-ph/fix_9.0_missing_hooks
Fix wrong placement to print title and missing hook to print value
|
2019-08-26 17:14:50 +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 |
|
Laurent Destailleur
|
7c5fc9f3f8
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2019-08-26 16:43:33 +02:00 |
|
Laurent Destailleur
|
c93e6550ce
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/compta/paiement.php
htdocs/compta/sociales/class/chargesociales.class.php
|
2019-08-26 16:43:24 +02:00 |
|
Laurent Destailleur
|
dcfbba9af5
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/compta/sociales/class/chargesociales.class.php
|
2019-08-26 16:41:06 +02:00 |
|
Laurent Destailleur
|
60b8982a74
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-08-26 16:39:39 +02:00 |
|
Laurent Destailleur
|
fc1381c056
|
Merge pull request #11739 from ptibogxiv/patch-239
Fix display context for takepos in invoice/list.php
|
2019-08-26 16:38:27 +02:00 |
|
Alexandre SPANGARO
|
76691925a4
|
FIX Missing div for buttons in tax, loan, various payment modules
|
2019-08-26 15:35:20 +02:00 |
|
ptibogxiv
|
7112fcee9a
|
Update list.php
|
2019-08-24 15:54:14 +02:00 |
|
ptibogxiv
|
2be125e647
|
Fix display context for takepos in invoice list
fix for thirdparty name and create button
|
2019-08-24 15:47:17 +02:00 |
|
Regis Houssin
|
064ab389ed
|
FIX wrong parameters (same error in branch 9, 10, develop)
|
2019-08-24 12:44:23 +02:00 |
|
atm-ph
|
f14f1c9190
|
Fix wrong placement to print title and missing hook to print value
|
2019-08-23 09:15:15 +02:00 |
|
Regis Houssin
|
2d59f6bb3d
|
FIX avoid sql error if fk_project is empty during update
|
2019-08-23 07:59:36 +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
|
54203dda1f
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/modules.php
|
2019-08-21 16:25:48 +02:00 |
|
Laurent Destailleur
|
def0311f9d
|
Fix translation
|
2019-08-19 17:26:13 +02:00 |
|
Laurent Destailleur
|
d304749eca
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-08-19 10:19:14 +02:00 |
|
Laurent Destailleur
|
21fc089f58
|
FIX Translation of month
|
2019-08-19 10:18:38 +02:00 |
|
Laurent Destailleur
|
6abfd8b145
|
Fix use short labels for workboard
|
2019-08-19 10:01:42 +02:00 |
|
Laurent Destailleur
|
71be9f5b3f
|
Fix test on terminal for 'cashdesk' module
|
2019-08-18 21:01:17 +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
|
783e01588c
|
FIX It was possible to create cashfence without entering data.
|
2019-08-18 20:47:40 +02:00 |
|
andreubisquerra
|
bbc1dfb0f7
|
Cashcontrol TakePOS fixes
|
2019-08-18 20:40:31 +02:00 |
|
Laurent Destailleur
|
f39e8ef835
|
Merge pull request #11703 from andreubisquerra/master
Cashcontrol TakePOS fixes
|
2019-08-18 20:39:57 +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 |
|
andreubisquerra
|
063f19fe67
|
Cashcontrol TakePOS fixes
|
2019-08-18 09:33:02 +02:00 |
|
Laurent Destailleur
|
5351d78a96
|
Merge branch 'develop' into develop_new_dashboard
|
2019-08-18 01:26:56 +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 |
|
Laurent Destailleur
|
6430c74793
|
Merge pull request #11168 from hregis/develop_menu
NEW add new function "setEntity()" and better compatibility with Multicompany
|
2019-08-15 21:00:05 +02:00 |
|
Laurent Destailleur
|
c1d54a7711
|
Merge pull request #11652 from prietojc/patch-6
FIX: Update() in charge sociales
|
2019-08-15 19:35:27 +02:00 |
|
Laurent Destailleur
|
4a083bb038
|
Update chargesociales.class.php
|
2019-08-15 19:35:05 +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 |
|
Regis Houssin
|
7c8b3c9a38
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
|
2019-08-13 07:34:02 +02:00 |
|
JC Prieto
|
d00f3c9685
|
Update chargesociales.class.php
|
2019-08-12 20:07:24 +02:00 |
|
JC Prieto
|
0e9898041e
|
Setting NULL if not project
|
2019-08-12 09:45:47 +02:00 |
|
Laurent Destailleur
|
14fabeb377
|
Variable rangtouse -> ranktouse
|
2019-08-10 00:46:20 +02:00 |
|
Frédéric FRANCE
|
aa462bac23
|
Add empty index.html
|
2019-08-09 09:25:48 +02:00 |
|
JC Prieto
|
faf65f39b6
|
FIX: Update() function checking
If module Project is off, shows an error.
|
2019-08-06 19:14:56 +02:00 |
|
John Botella
|
b4c4e5a662
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard
|
2019-08-02 14:52:01 +02:00 |
|
Laurent Destailleur
|
3d8f6dca76
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-08-01 16:30:32 +02:00 |
|
Laurent Destailleur
|
6693f9fbca
|
Fix phpcs
|
2019-08-01 16:24:19 +02:00 |
|
Laurent Destailleur
|
d7a41c6b72
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/admin.lang
|
2019-08-01 12:54:27 +02:00 |
|
John Botella
|
9b84987cc1
|
prepare new dashboard
|
2019-08-01 12:33:19 +02:00 |
|
Laurent Destailleur
|
5eb8f05061
|
FIX #11584
|
2019-08-01 12:23:02 +02:00 |
|
Regis Houssin
|
d9ea61e47c
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop_menu
Conflicts:
htdocs/commande/class/commande.class.php
|
2019-07-31 12:49:56 +02:00 |
|
Laurent Destailleur
|
a7390e7e47
|
Merge pull request #11396 from ATM-Consulting/New_retained_warranty_develop
NEW Management of retained warranty on situation invoices
|
2019-07-30 21:53:09 +02:00 |
|
Laurent Destailleur
|
dca775985f
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-30 20:55:41 +02:00 |
|
Laurent Destailleur
|
34f78c555d
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-30 20:55:35 +02:00 |
|
Laurent Destailleur
|
192fb45ce7
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/accountancy/bookkeeping/card.php
htdocs/accountancy/bookkeeping/list.php
htdocs/adherents/card.php
htdocs/compta/sociales/list.php
htdocs/compta/sociales/payments.php
htdocs/core/modules/import/import_csv.modules.php
htdocs/core/modules/import/import_xlsx.modules.php
htdocs/holiday/class/holiday.class.php
htdocs/viewimage.php
|
2019-07-30 20:55:15 +02:00 |
|
Laurent Destailleur
|
5cbde99871
|
Merge pull request #11579 from atm-maxime/new_withdraw_date_rum
NEW Can edit date or RUM mandate
|
2019-07-30 16:04:57 +02:00 |
|
ptibogxiv
|
5b1a89bf94
|
Fix php error with const
|
2019-07-30 15:42:37 +02:00 |
|
ptibogxiv
|
5880d549fb
|
Fix php error with const
|
2019-07-30 11:55:46 +02:00 |
|
Laurent Destailleur
|
11e3aa5860
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-29 11:07:11 +02:00 |
|
Laurent Destailleur
|
7931f0b422
|
Fix sql error
|
2019-07-29 11:06:39 +02:00 |
|
Laurent Destailleur
|
a5e3adc6f1
|
Fix travis
|
2019-07-29 10:51:17 +02:00 |
|
Laurent Destailleur
|
db461792a0
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-29 01:36:35 +02:00 |
|
Laurent Destailleur
|
9a7113f4f5
|
FIX Update the file index table when we validate/rename a ref.
|
2019-07-28 22:26:55 +02:00 |
|
Maxime Kohlhaas
|
3cc2c91e31
|
Use date_rum if defined
|
2019-07-28 22:26:19 +02:00 |
|
atm-quentin
|
f7c739bba9
|
FIX wrong path sociales/index.php doesnt exist anymore
|
2019-07-26 12:12:08 +02:00 |
|
Laurent Destailleur
|
a46bfc7a29
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/project.lib.php
|
2019-07-25 17:54:14 +02:00 |
|
Laurent Destailleur
|
2dc2af7c41
|
Merge pull request #11552 from aspangaro/10.0_FEC
Presentation nowrap on amount
|
2019-07-25 17:35:36 +02:00 |
|
Alexandre SPANGARO
|
3921f706e2
|
Presentation nowrap on amount
|
2019-07-24 09:01:11 +02:00 |
|
Laurent Destailleur
|
8aaa716e33
|
Fix missing title
|
2019-07-23 13:05:33 +02:00 |
|
Laurent Destailleur
|
a61fdc5a3c
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-23 00:25:10 +02:00 |
|
Laurent Destailleur
|
a33ac665bb
|
Fix phpcs
|
2019-07-22 22:07:04 +02:00 |
|
Laurent Destailleur
|
bef3423764
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/admin.lang
|
2019-07-22 19:12:27 +02:00 |
|
Laurent Destailleur
|
9f95b10d0e
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/comm/action/list.php
htdocs/comm/action/peruser.php
htdocs/compta/prelevement/card.php
htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
|
2019-07-22 19:11:27 +02:00 |
|
Laurent Destailleur
|
4833c2bf49
|
Merge
|
2019-07-22 18:50:17 +02:00 |
|
Laurent Destailleur
|
f5afc50067
|
Merge branch '11.0_salaries' of https://github.com/aspangaro/dolibarr into aspangaro-11.0_salaries
|
2019-07-22 18:47:35 +02:00 |
|
Laurent Destailleur
|
a379d7804c
|
Merge pull request #11535 from aspangaro/11.0_p1
QUAL Move ligne.php to line.php
|
2019-07-22 18:33:06 +02:00 |
|
Laurent Destailleur
|
cf87196f37
|
Fix css
|
2019-07-21 20:55:12 +02:00 |
|
Laurent Destailleur
|
d6d1b29257
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-21 16:15:32 +02:00 |
|
Laurent Destailleur
|
4f34a8b6e8
|
FIX Position was lost when we edit the line of template invoice
|
2019-07-21 16:15:13 +02:00 |
|
Laurent Destailleur
|
f368ef377b
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/societe/class/societe.class.php
|
2019-07-20 16:02:15 +02:00 |
|
Laurent Destailleur
|
f6c937a218
|
Fix translation
|
2019-07-20 14:14:18 +02:00 |
|
Laurent Destailleur
|
0dcd38b96f
|
Fix decimals
|
2019-07-20 14:09:42 +02:00 |
|
Laurent Destailleur
|
865ebb9de2
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/ticket/class/ticket.class.php
|
2019-07-20 13:29:10 +02:00 |
|
Alexandre SPANGARO
|
5f042cf6ad
|
QUAL Move ligne.php to line.php
|
2019-07-19 23:19:06 +02:00 |
|
Alexandre SPANGARO
|
0af1206892
|
Merge branch 'develop' into 11.0_salaries
|
2019-07-19 23:11:06 +02:00 |
|
Alexandre SPANGARO
|
9ab0734415
|
NEW Extrafields on salaries
|
2019-07-19 23:08:24 +02:00 |
|
Laurent Destailleur
|
e5c3945ec3
|
FIX delete of links between objects
|
2019-07-19 18:10:45 +02:00 |
|
Laurent Destailleur
|
14751680d2
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-19 13:38:05 +02:00 |
|
Laurent Destailleur
|
2e08c02510
|
Better error management
|
2019-07-19 13:37:28 +02:00 |
|
Laurent Destailleur
|
f745d01bf3
|
Prepare change of properties "titre" into "title"
|
2019-07-19 13:22:54 +02:00 |
|
atm-ph
|
a03bb00254
|
Fix missing hook
|
2019-07-19 11:26:21 +02:00 |
|
Regis Houssin
|
cbda42d146
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
|
2019-07-19 09:37:34 +02:00 |
|
Laurent Destailleur
|
e5801c0b68
|
Update bonprelevement.class.php
|
2019-07-19 04:06:22 +02:00 |
|
Laurent Destailleur
|
50480bf517
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/opensurvey/index.php
|
2019-07-18 18:23:24 +02:00 |
|
Laurent Destailleur
|
3cffd70ed3
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/prelevement/create.php
htdocs/core/class/commonobject.class.php
htdocs/expedition/card.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/commande/dispatch.php
htdocs/fourn/product/list.php
htdocs/opensurvey/index.php
htdocs/ticket/index.php
htdocs/ticket/list.php
|
2019-07-18 18:09:37 +02:00 |
|
atm-ph
|
fcd95ce073
|
Fix missing trigger call
|
2019-07-18 18:07:17 +02:00 |
|
Laurent Destailleur
|
b3182f65bc
|
Update create.php
|
2019-07-18 17:23:52 +02:00 |
|
Laurent Destailleur
|
e548872133
|
Update prelevement.php
|
2019-07-18 17:23:05 +02:00 |
|
atm-ph
|
984fe98342
|
Fix missing hook
|
2019-07-18 16:12:42 +02:00 |
|
atm-ph
|
c961a397c4
|
Fix missing hook then can't interact with actions
|
2019-07-18 15:40:50 +02:00 |
|
Laurent Destailleur
|
2c0c5a505f
|
Merge pull request #11351 from rycks/tvaPrint
Update print VAT document: remove form part and add right title
|
2019-07-16 17:18:07 +03:00 |
|
Laurent Destailleur
|
b9771db131
|
Fix phpcs
|
2019-07-16 17:16:49 +03:00 |
|
Laurent Destailleur
|
adfbd62f8b
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-14 00:44:35 +02:00 |
|
Laurent Destailleur
|
e0095871aa
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/stats/byratecountry.php
htdocs/core/class/html.form.class.php
|
2019-07-14 00:19:56 +02:00 |
|
Laurent Destailleur
|
3bfc1938d3
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/class/commonobject.class.php
|
2019-07-14 00:13:16 +02:00 |
|
Laurent Destailleur
|
b66ad24d85
|
Fix save of doc template for recuring invoices.
|
2019-07-14 00:10:15 +02:00 |
|
Laurent Destailleur
|
39e77dbdc6
|
Merge pull request #11461 from ATM-Nicolas/fix_template_invoice_edit_modelpdf
FIX : We must save code instead of value in database…
|
2019-07-14 00:19:13 +03:00 |
|
Laurent Destailleur
|
b6571d9fc3
|
Update byratecountry.php
|
2019-07-13 22:39:25 +02:00 |
|
gauthier
|
cce8f98afc
|
FIX : accounting mode must be taken from global conf, because there's no way to choose a mode with interface
|
2019-07-10 16:33:03 +02:00 |
|
Maxime Kohlhaas
|
0aa42fefae
|
Fix : use RUM if defined in bank account
|
2019-07-09 18:13:11 +02:00 |
|
Laurent Destailleur
|
f5cc29417d
|
Translation lignes -> lines
|
2019-07-05 21:50:35 +02:00 |
|
Laurent Destailleur
|
0a7d70829f
|
Translation of some comments
|
2019-07-05 21:37:25 +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 |
|
ATM-Nicolas
|
3d076d8bf9
|
FIX : We must save code instead of value in database for template invoice modelpdf
|
2019-07-05 11:16:12 +02:00 |
|
Laurent Destailleur
|
2fee41f712
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-04 12:27:00 +02:00 |
|
Laurent Destailleur
|
69e0353e12
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2019-07-04 12:26:26 +02:00 |
|
Laurent Destailleur
|
8e3620fce1
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/compta/facture/invoicetemplate_list.php
|
2019-07-04 12:26:17 +02:00 |
|
Laurent Destailleur
|
ee0a65e7fa
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/comm/action/card.php
|
2019-07-04 12:22:40 +02:00 |
|
Laurent Destailleur
|
bc309ace38
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-07-04 12:21:16 +02:00 |
|
Louis Sautier
|
818a8c7d59
|
Fix missing form end tag in prelevement
|
2019-07-03 10:46:32 +02:00 |
|
Alexandre SPANGARO
|
ab7cb7bb2e
|
FIX Nowrap on amount
|
2019-07-02 12:01:50 +02:00 |
|
Maxime Kohlhaas
|
6b43c325c7
|
Fix wrong column for filters on invoice template list
|
2019-07-02 10:53:47 +02:00 |
|
John Botella
|
9c2e83dcae
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
|
2019-07-01 09:51:26 +02:00 |
|
Laurent Destailleur
|
8919eaebab
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-29 23:27:15 +02:00 |
|
Laurent Destailleur
|
2cefe638ef
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
build/makepack-dolibarr.pl
htdocs/compta/prelevement/factures.php
|
2019-06-29 23:24:04 +02:00 |
|
Laurent Destailleur
|
81bb85c4df
|
Merge
|
2019-06-29 23:19:47 +02:00 |
|
Laurent Destailleur
|
adb3062a9f
|
Work on nblignes -> nblines
|
2019-06-29 16:38:14 +02:00 |
|
John Botella
|
75b55ac5d6
|
fix travis recommendations
|
2019-06-28 16:10:41 +02:00 |
|
Laurent Destailleur
|
854bbf8405
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-06-28 14:09:00 +02:00 |
|
Laurent Destailleur
|
c0ba22fc6c
|
Merge pull request #11406 from ptibogxiv/patch-194
NEW Can load multilang translation in same step than fetch_lines
|
2019-06-28 14:04:06 +02:00 |
|
Maxime Kohlhaas
|
fc1d4704a5
|
Fix invoice list filter on withdrawal card
|
2019-06-27 17:33:47 +02:00 |
|
Laurent Destailleur
|
6136dd6e7c
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-27 13:57:08 +02:00 |
|
Laurent Destailleur
|
8c6485fa20
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
ChangeLog
htdocs/compta/facture/card.php
|
2019-06-27 13:56:33 +02:00 |
|
Laurent Destailleur
|
d69b20311b
|
FIX If the replacement invoice has been deleted we can reopen
|
2019-06-27 01:13:46 +02:00 |
|
Laurent Destailleur
|
be695a8e1a
|
Fix link for situations
|
2019-06-27 00:51:03 +02:00 |
|
John Botella
|
ee98f3e6d7
|
fix travis recommendations
|
2019-06-26 10:48:22 +02:00 |
|
John Botella
|
7e14a598e2
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
|
2019-06-26 09:43:43 +02:00 |
|
ptibogxiv
|
c81ffcd8f0
|
Update facture.class.php
|
2019-06-25 18:14:56 +02:00 |
|
ptibogxiv
|
66eec4da52
|
Update facture.class.php
|
2019-06-25 15:46:12 +02:00 |
|
Laurent Destailleur
|
fa476b4994
|
Properties ->libelle_incoterms were renamed into ->label_incoterms
|
2019-06-25 13:00:02 +02:00 |
|
Laurent Destailleur
|
d810e11c4e
|
Update fiche-rec.php
|
2019-06-24 19:23:32 +02:00 |
|
John Botella
|
ec7446762c
|
Fix travis
|
2019-06-24 14:36:06 +02:00 |
|
Laurent Destailleur
|
1daac232b0
|
Code comment
|
2019-06-24 14:31:58 +02:00 |
|
John Botella
|
a83e7f3665
|
Add retained warranty to PDF
|
2019-06-24 12:00:55 +02:00 |
|
John Botella
|
7b6925b8f7
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
|
2019-06-24 10:29:43 +02:00 |
|
Laurent Destailleur
|
5675e7c50e
|
Clean code of deprecated method
|
2019-06-22 18:19:40 +02:00 |
|
Laurent Destailleur
|
8da5794777
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/accounting.lib.php
htdocs/product/stock/class/entrepot.class.php
|
2019-06-20 18:24:43 +02:00 |
|
Laurent Destailleur
|
d47cf87c00
|
Look and feel v10
|
2019-06-20 17:59:28 +02:00 |
|
Laurent Destailleur
|
c521b9b8f8
|
Fix dispatch in ledger table of withdraw / direct debit payment
|
2019-06-20 16:58:51 +02:00 |
|
Laurent Destailleur
|
4f9aa4caac
|
Fix phpcs
|
2019-06-20 13:53:31 +02:00 |
|
Laurent Destailleur
|
4ffa48d9bd
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-20 13:50:47 +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
|
d15a300f02
|
Removed not used var
|
2019-06-20 04:10:58 +02:00 |
|
Laurent Destailleur
|
a264a4766a
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-20 03:45:04 +02:00 |
|
Laurent Destailleur
|
898d766489
|
Merge pull request #11354 from rycks/allowZeroAsAccountNumber
Allow zero as account number
|
2019-06-20 03:09:37 +02:00 |
|
Laurent Destailleur
|
4308f48cad
|
Merge branch 'develop' into MissingHook
|
2019-06-20 03:04:32 +02:00 |
|
Laurent Destailleur
|
925314c710
|
Merge pull request #11367 from aspangaro/10.0_other3
Nowrap on amount
|
2019-06-20 02:51:14 +02:00 |
|
Laurent Destailleur
|
e060af5c97
|
Update treso.php
|
2019-06-20 02:50:23 +02:00 |
|
Laurent Destailleur
|
daa8b43732
|
css
|
2019-06-19 15:51:48 +02:00 |
|
Laurent Destailleur
|
a11c816a17
|
Fix tooltip
|
2019-06-19 14:24:48 +02:00 |
|
Alexandre SPANGARO
|
9a32117b1d
|
Nowrap on amount
|
2019-06-19 08:43:57 +02:00 |
|
Nicolas ZABOURI
|
2e4db8c83c
|
Merge remote-tracking branch 'Dolibarr/10.0' into MissingHook
|
2019-06-19 08:39:05 +02:00 |
|
Alexandre SPANGARO
|
a849fbe42e
|
Nowrap on amount
|
2019-06-19 07:15:52 +02:00 |
|
Laurent Destailleur
|
f3703c8805
|
Fix phpcs
|
2019-06-18 18:07:47 +02:00 |
|
Laurent Destailleur
|
2e1eb29ca0
|
Fix rendering of amount
|
2019-06-18 17:43:08 +02:00 |
|
Laurent Destailleur
|
27f52dd0bd
|
Fix columns in csv
|
2019-06-18 14:32:35 +02:00 |
|
Laurent Destailleur
|
ad20a5158c
|
Fix columns in csv
|
2019-06-18 14:32:28 +02:00 |
|
Laurent Destailleur
|
8835b49f3f
|
Debug the accounting-file tool
|
2019-06-18 14:30:13 +02:00 |
|
ICstage
|
820c420ae5
|
FIX Missing hooks
|
2019-06-18 14:07:52 +02:00 |
|
Eric Seigne
|
0b3bc5a172
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into allowZeroAsAccountNumber
|
2019-06-17 18:30:11 +02:00 |
|
Eric Seigne
|
80d4d8754d
|
allow zero as accountancy code nomber (replace all empty tests by != '')
|
2019-06-17 18:28:11 +02:00 |
|
Laurent Destailleur
|
08d5ca4ddb
|
Debug page to export accounting documents
|
2019-06-17 17:53:43 +02:00 |
|
Laurent Destailleur
|
2fab35c287
|
Debug page to export file
|
2019-06-17 17:20:22 +02:00 |
|
Laurent Destailleur
|
a74eaaff4d
|
Fix sort of linked elements
|
2019-06-17 15:54:54 +02:00 |
|
Eric Seigne
|
71d984483d
|
Update print VAT document: remove form part and add right title
|
2019-06-17 14:45:49 +02:00 |
|
Regis Houssin
|
6597c9f60d
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
|
2019-06-17 06:45:08 +02:00 |
|
Laurent Destailleur
|
a7e0589071
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-12 13:59:22 +02:00 |
|
Laurent Destailleur
|
c57013f293
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-12 13:59:14 +02:00 |
|
Laurent Destailleur
|
3ad36a51db
|
Merge pull request #11312 from aspangaro/10.0_b1
Look and feel v10
|
2019-06-12 13:11:27 +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 |
|
Laurent Destailleur
|
509ca489b2
|
Update card.php
|
2019-06-12 13:06:02 +02:00 |
|
Alexandre SPANGARO
|
eb4dc36e05
|
Responsive on invoice index
|
2019-06-12 04:56:16 +02:00 |
|
Alexandre SPANGARO
|
f3cba86282
|
Better look
|
2019-06-10 07:49:10 +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 |
|
Alexandre SPANGARO
|
ae686ff62a
|
Better look
|
2019-06-09 08:39:38 +02:00 |
|
Laurent Destailleur
|
1b77d2f10b
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-07 22:56:58 +02:00 |
|
Laurent Destailleur
|
f713deb0a8
|
Fix sql syntax error
|
2019-06-07 22:55:51 +02:00 |
|
Laurent Destailleur
|
0099c1f602
|
Fix missing date
|
2019-06-07 22:55:18 +02:00 |
|
Laurent Destailleur
|
49646663a1
|
Fix link on invoice
|
2019-06-07 22:47:15 +02:00 |
|
Laurent Destailleur
|
e3812e3b0c
|
FIX source template invoice not loaded/shown
|
2019-06-05 08:20:10 +02:00 |
|
Laurent Destailleur
|
c200ec22da
|
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
|
2019-06-05 08:17:28 +02:00 |
|
Laurent Destailleur
|
5451d72900
|
FIX source template invoice not loaded/shown
|
2019-06-05 08:08:31 +02:00 |
|
Laurent Destailleur
|
4a63c6d38a
|
Fix phpcs
|
2019-06-04 19:20:08 +02:00 |
|
Laurent Destailleur
|
21a1e0d7b3
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/categories/index.php
htdocs/comm/action/list.php
htdocs/comm/action/rapport/index.php
htdocs/compta/paiement.php
htdocs/compta/sociales/document.php
htdocs/compta/tva/document.php
htdocs/core/actions_massactions.inc.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/facture/paiement.php
htdocs/loan/document.php
htdocs/main.inc.php
|
2019-06-04 19:03:27 +02:00 |
|
John BOTELLA
|
d7a393bbd3
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
|
2019-06-04 14:00:18 +02:00 |
|
Laurent Destailleur
|
969e139d5c
|
Fix parameters of accessforbidden
|
2019-06-04 12:21:27 +02:00 |
|
Laurent Destailleur
|
2c04a480a2
|
Fix phpcs
|
2019-06-04 02:31:19 +02:00 |
|
Laurent Destailleur
|
ba2b07917b
|
Fix look and feel v10
|
2019-06-04 02:11:03 +02:00 |
|
Regis Houssin
|
fc83585574
|
FIX use setEntity() to move code in multicompany module
|
2019-06-03 11:37:04 +02:00 |
|
Regis Houssin
|
7b8b1a9052
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
|
2019-06-03 11:04:28 +02:00 |
|
Laurent Destailleur
|
57cfb4b007
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/website/class/website.class.php
|
2019-06-02 12:36:07 +02:00 |
|
Laurent Destailleur
|
a1a9313487
|
Merge pull request #11292 from atm-maxime/fix_invoice_from_contract2
Fix : only invoice active lines of a contract
|
2019-06-02 12:29:13 +02:00 |
|
Laurent Destailleur
|
4bbef9b478
|
Update card.php
|
2019-06-02 12:29:05 +02:00 |
|
Laurent Destailleur
|
7020e1ef29
|
Update card.php
|
2019-06-02 12:27:32 +02:00 |
|
Maxime Kohlhaas
|
916d3ce931
|
Fix : only invoice active lines of a contract
|
2019-06-02 11:00:58 +02:00 |
|
Maxime Kohlhaas
|
6dd01e86e9
|
Fix : avoid warning and uniformize var use
|
2019-05-31 15:53:23 +02:00 |
|
Laurent Destailleur
|
03feb3604c
|
Merge pull request #11265 from frederic34/patch-2
Update tpl linked invoices
|
2019-05-29 13:54:09 +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 |
|
Frédéric FRANCE
|
6bb1a4a0e6
|
Update linkedobjectblock.tpl.php
|
2019-05-29 11:26:04 +02:00 |
|
Frédéric FRANCE
|
c5c7e8d451
|
Update linkedobjectblock.tpl.php
|
2019-05-29 11:18:01 +02:00 |
|
Laurent Destailleur
|
2218994958
|
FIX Duplicate encoding on error message
|
2019-05-29 09:51:45 +02:00 |
|
Laurent Destailleur
|
848b8f9bc4
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/public/cron/cron_run_jobs.php
htdocs/public/payment/newpayment.php
scripts/cron/cron_run_jobs.php
|
2019-05-27 19:01:28 +02:00 |
|
Laurent Destailleur
|
71da27f333
|
Add error message
|
2019-05-27 16:40:06 +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
|
19ff0120ff
|
# WARNING: head commit changed in the meantime
Removed uselesss files (replaced by DebugBar)
|
2019-05-26 11:42:00 +02:00 |
|
Laurent Destailleur
|
a40e5ca66c
|
Fix phpcs
|
2019-05-26 11:36:16 +02:00 |
|
Laurent Destailleur
|
ccfb4f575b
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formfile.class.php
|
2019-05-24 15:00:14 +02:00 |
|
Laurent Destailleur
|
89455672a2
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
|
2019-05-24 14:58:21 +02:00 |
|
Laurent Destailleur
|
18f1952e2d
|
Fix set of properties
|
2019-05-22 14:49:18 +02:00 |
|
Marc de Lima Lucio
|
54f8c98b27
|
FIX: remove isolated transaction commit
|
2019-05-22 11:12:02 +02:00 |
|
Marc de Lima Lucio
|
66dd7e30ae
|
FIX: situation invoices: block progress percentage change for discount lines
|
2019-05-22 10:46:38 +02:00 |
|
Regis Houssin
|
4f2f23f522
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
|
2019-05-22 08:45:31 +02:00 |
|
Laurent Destailleur
|
22e897b1a1
|
Clean and prepare code to fix a SQL injection
|
2019-05-21 17:22:38 +02:00 |
|
Laurent Destailleur
|
6365c7cd00
|
Bad cut and paste
|
2019-05-21 12:17:07 +02:00 |
|
Regis Houssin
|
2cf630c213
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
|
2019-05-20 16:10:47 +02:00 |
|
Laurent Destailleur
|
321544b3fa
|
Fix phpcs
|
2019-05-20 15:25:39 +02:00 |
|
Laurent Destailleur
|
c3732f2b7a
|
Fix edition of margins in recurring invoices
|
2019-05-20 14:41:47 +02:00 |
|
Laurent Destailleur
|
83c369cc0f
|
Add $array_to_check for property in invoice instead of thirdparty
|
2019-05-20 13:02:33 +02:00 |
|
Laurent Destailleur
|
91dd8a71d3
|
Fix syntax error
|
2019-05-20 12:50:00 +02:00 |
|
Laurent Destailleur
|
827a2e1809
|
Fix test if qualified for stock change at wrong place
|
2019-05-20 12:47:02 +02:00 |
|
Laurent Destailleur
|
5f23cf7e2a
|
CSS
|
2019-05-19 13:51:47 +02:00 |
|
Laurent Destailleur
|
2bbb04085e
|
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/modulebuilder/template/class/myobject.class.php
|
2019-05-19 02:15:01 +02:00 |
|
Laurent Destailleur
|
71ef8c881b
|
Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
Conflicts:
htdocs/modulebuilder/template/class/myobject.class.php
|
2019-05-19 02:06:20 +02:00 |
|
Laurent Destailleur
|
2fd3eb8bdf
|
Update facture.class.php
|
2019-05-19 01:58:01 +02:00 |
|
florian HENRY
|
7f8c118466
|
fix: #11015
|
2019-05-19 01:52:50 +02:00 |
|
ATM-Marc
|
83c38570e9
|
FIX: invoice class: bad SQL request if product type not set
|
2019-05-19 01:01:21 +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 |
|
Laurent Destailleur
|
26d4875f8f
|
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop
|
2019-05-18 02:27:23 +02:00 |
|
Laurent Destailleur
|
68118e55dc
|
Update api_invoices.class.php
|
2019-05-18 00:58:43 +02:00 |
|
Maxime Kohlhaas
|
1af69d4c8f
|
Fix varnames in invoice api
|
2019-05-18 00:40:29 +02:00 |
|
Laurent Destailleur
|
c1ec7454a1
|
Merge branch 'develop' into clean_10_beta
|
2019-05-16 21:21:51 +02:00 |
|
Laurent Destailleur
|
9f8f45d5bc
|
FIX Payment on supplier invoice should not mix credit note and standard
invoices.
|
2019-05-14 12:00:58 +02:00 |
|
Francis Appels
|
a2d4a59321
|
Merge branch 'develop' into clean_10_beta
|
2019-05-13 21:27:13 +02:00 |
|
Regis Houssin
|
62489d1f5e
|
FIX replace "dir_output" with "multidir_output"
|
2019-05-12 14:41:30 +02:00 |
|
Regis Houssin
|
b73df2698d
|
FIX better compatibility with Multicompany
|
2019-05-12 14:25:41 +02:00 |
|
Laurent Destailleur
|
aaeb7dc9d6
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/holiday.php
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/filefunc.inc.php
htdocs/product/list.php
|
2019-05-10 17:45:33 +02:00 |
|
John BOTELLA
|
f296093f8d
|
fix travis
|
2019-05-10 15:52:46 +02:00 |
|
Laurent Destailleur
|
9de0e69456
|
FIX column project into list
|
2019-05-10 15:11:06 +02:00 |
|
Laurent Destailleur
|
5625c94c44
|
Fix missing label on project tooltip
|
2019-05-10 14:40:15 +02:00 |
|
Laurent Destailleur
|
0e8184332e
|
Fix missing label on project tooltip
|
2019-05-10 14:39:05 +02:00 |
|
Laurent Destailleur
|
6cb96b926b
|
Fix phpcs
|
2019-05-09 21:34:22 +02:00 |
|
Laurent Destailleur
|
78c4a3cced
|
Fix lang
|
2019-05-09 18:33:50 +02:00 |
|
Laurent Destailleur
|
a94c291b76
|
Dolibarization
|
2019-05-09 16:59:06 +02:00 |
|
Laurent Destailleur
|
3bf162dcd6
|
Clean code for v10
|
2019-05-09 14:36:48 +02:00 |
|
Laurent Destailleur
|
74875690a0
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/tpl/massactions_pre.tpl.php
|
2019-05-08 19:14:31 +02:00 |
|
Laurent Destailleur
|
f6de2d091d
|
FIX Sending email to mass actions send same email on same customer
|
2019-05-08 19:07:12 +02:00 |
|
Laurent Destailleur
|
1e036f3513
|
Correct support for type price on module builder
Fix link of ref in cash fence list
|
2019-05-08 01:09:38 +02:00 |
|
Francis Appels
|
03e2983d40
|
Merge branch 'develop' into clean_10_beta
|
2019-05-06 15:22:27 +02:00 |
|
ptibogxiv
|
c94e621059
|
FIX : facnumber to ref report takepos
|
2019-05-04 17:23:57 +02:00 |
|
Laurent Destailleur
|
64fb7bd1c2
|
Merge pull request #11103 from grandoc/new_branch_02_05_2019
inactive a var_dump
|
2019-05-03 02:29:25 +02:00 |
|
Philippe GRAND
|
bcd96ba8d6
|
inactive a var_dump
|
2019-05-02 14:42:02 +02:00 |
|
Laurent Destailleur
|
4f9ea912ab
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/website.inc.php
|
2019-05-02 14:41:56 +02:00 |
|
Laurent Destailleur
|
e2c7c0574e
|
Merge pull request #11086 from andreubisquerra/master
NEW Add history to view and print previous sales on TakePos.
|
2019-05-02 14:04:57 +02:00 |
|
Ferran Marcet
|
be17e31be1
|
New: Add ref_client field on template invoice
|
2019-05-02 11:04:55 +02:00 |
|
Francis Appels
|
18c5c586ab
|
Cleanup set_draft in syslog
|
2019-05-01 09:38:27 +02:00 |
|
Laurent Destailleur
|
9c45b781af
|
Fix balance of colspan
|
2019-04-30 16:44:11 +02:00 |
|
Laurent Destailleur
|
2136bce4b0
|
FIX missing situation invoice in list
|
2019-04-30 15:10:38 +02:00 |
|
andreubisquerra
|
00db274956
|
Add history to view and print previous sales.
|
2019-04-28 18:12:33 +02:00 |
|
Ferran Marcet
|
7a651b5071
|
New: Add ref_client field on template invoice
|
2019-04-26 13:53:22 +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
|
3b04d2fe9b
|
Fix warnings
|
2019-04-23 13:21:17 +02:00 |
|
Laurent Destailleur
|
7f4b09c482
|
Fix warnings
|
2019-04-23 13:20:44 +02:00 |
|
Laurent Destailleur
|
4d92d7731c
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/sendings.lib.php
htdocs/langs/en_US/admin.lang
htdocs/theme/eldy/style.css.php
|
2019-04-23 12:32:08 +02:00 |
|
Laurent Destailleur
|
84ec39f043
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-04-23 12:25:53 +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
|
74ba9f57f1
|
Fix phpcs
|
2019-04-19 18:48:00 +02:00 |
|
John BOTELLA
|
0855d84ccf
|
FIX error messages not displayed
|
2019-04-18 10:40:34 +02:00 |
|
atm-quentin
|
cb7f9c2b6f
|
NEW filter by thirdparty on report CA by prod/serv
|
2019-04-17 14:35:46 +02:00 |
|
Laurent Destailleur
|
e6ffaeefe5
|
CSS
|
2019-04-17 10:39:30 +02:00 |
|
Laurent Destailleur
|
212b058f46
|
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
|
2019-04-17 01:18:46 +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 |
|
Philippe GRAND
|
728381e6e6
|
FIX : bug #11018
|
2019-04-15 15:10:44 +02:00 |
|
ATM john
|
292d9c38a5
|
Appli function to links
|
2019-04-15 00:21:58 +02:00 |
|
Laurent Destailleur
|
76567b1d07
|
NEW Can filter on the date of period for social contributions
|
2019-04-12 12:51:48 +02:00 |
|
Laurent Destailleur
|
cf058e7d3b
|
NEW Ask date of invoice when using the Clone feature.
|
2019-04-12 12:12:08 +02:00 |
|
ATM john
|
bc4db54722
|
add more class
|
2019-04-11 21:29:01 +02:00 |
|
ATM john
|
3390ba0e77
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_look_and_feel_title_button
|
2019-04-11 21:16:42 +02:00 |
|
Laurent Destailleur
|
8079a389f8
|
Merge pull request #10992 from altatof/faccard2
NEW : retrieve invoice infos from order when billing shipment
|
2019-04-11 16:34:42 +02:00 |
|
Laurent Destailleur
|
f2fd07d824
|
Merge pull request #10991 from altatof/faccard
NEW constant KEEP_DISCOUNT_LINES_FROM_ORIGIN
|
2019-04-11 16:31:37 +02:00 |
|
Laurent Destailleur
|
4f87018c33
|
Update card.php
|
2019-04-11 16:31:13 +02:00 |
|
ATM john
|
29b31bd7ab
|
New title button first step
|
2019-04-11 00:38:44 +02:00 |
|
Christophe Battarel
|
46e398f3d3
|
NEW : retrieve invoice infos from order when billing shipment
|
2019-04-10 10:50:01 +02:00 |
|
Christophe Battarel
|
b04296984d
|
NEW constant KEEP_DISCOUNT_LINES_FROM_ORIGIN
|
2019-04-10 10:29:17 +02:00 |
|
Christophe Battarel
|
5f9f615e11
|
fix form_conditions_reglement parameters
|
2019-04-09 18:37:36 +02:00 |
|
Christophe Battarel
|
790c5f493a
|
fix select_conditions parameters
|
2019-04-09 18:32:00 +02:00 |
|
Christophe Battarel
|
01255602d8
|
fix select_conditions parameters
|
2019-04-09 18:30:58 +02:00 |
|
Christophe Battarel
|
5382ad207f
|
NEW : add payment terms to invoices list
|
2019-04-09 18:26:00 +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
|
7b01e76d2b
|
Fix doxygen
|
2019-04-08 16:04:15 +02:00 |
|
Laurent Destailleur
|
1274d71a10
|
Fix phpcs
|
2019-04-08 16:00:01 +02:00 |
|
Laurent Destailleur
|
2047ad62c5
|
Merge pull request #10979 from fpeyraud/develop
Fix redirection on social tax deletion
|
2019-04-08 13:58:07 +02:00 |
|
Florent Peyraud
|
7672fd7cf0
|
Fix redirection on social tax deletion
|
2019-04-08 09:05:51 +02:00 |
|
Dan Rusu
|
4597e78a9d
|
Re synchronized the UI action button "Mark as credit available" with API
At some point we will need to move this code into common location (maybe facture.class.php) and call as function from both places
|
2019-04-06 20:10:11 +03:00 |
|
Laurent Destailleur
|
bb9cd05ea8
|
Fix phpcs
|
2019-04-02 20:02:43 +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
|
37b8796f3c
|
NEW Add line total on list of payments
|
2019-04-02 17:54:34 +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 |
|
Laurent Destailleur
|
ec9fdc1321
|
Fix regression with class="right". Style of amount lost.
|
2019-03-31 11:25:29 +02:00 |
|
Alexandre SPANGARO
|
5588fe5b81
|
FIX: Don't show journal:getNomUrl without data
ErrorBadValueForParamNotAString
|
2019-03-30 09:42:13 +01:00 |
|
Laurent Destailleur
|
5e23c4c03c
|
Fix self: not defined in a page
|
2019-03-29 16:23:55 +01:00 |
|
Laurent Destailleur
|
1b2826f476
|
Look and feel v10
|
2019-03-29 13:26:26 +01:00 |
|
Laurent Destailleur
|
11e4411400
|
TakePOS Can enter payment in several times and with different modes
|
2019-03-27 15:42:53 +01:00 |
|
Laurent Destailleur
|
a34f4c2806
|
Merge pull request #10909 from IonAgorria/fix-line-dates
FIX: Disallow line start date after end date
|
2019-03-26 19:43:11 +01:00 |
|
Laurent Destailleur
|
f27f65e8bf
|
Responsive
|
2019-03-25 10:09:02 +01:00 |
|
Laurent Destailleur
|
1409d1a2c8
|
Fix phpcs
|
2019-03-24 19:52:48 +01:00 |
|
Laurent Destailleur
|
89b7f1a040
|
Fix phpcs
|
2019-03-24 19:52:18 +01:00 |
|
Laurent Destailleur
|
3578c7cb0a
|
Fix phpcs
|
2019-03-24 18:20:56 +01:00 |
|
Laurent Destailleur
|
364deb1476
|
Fix phpcs
|
2019-03-24 16:09:48 +01:00 |
|
Laurent Destailleur
|
28abf5663b
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/tva/clients.php
|
2019-03-24 15:06:16 +01:00 |
|
Laurent Destailleur
|
2034ac61ef
|
Fix phpcs
|
2019-03-24 15:05:02 +01:00 |
|
Ion
|
7bfa49b29c
|
FIX: Disallow line start date > end date
|
2019-03-24 14:30:00 +01:00 |
|
Laurent Destailleur
|
20f3af066c
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/tva/clients.php
|
2019-03-23 22:44:14 +01:00 |
|
Laurent Destailleur
|
79ed4bc80b
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/actions_massactions.inc.php
|
2019-03-23 22:36:04 +01:00 |
|
Laurent Destailleur
|
28fede950f
|
Hidden option CHANGE_ORDER_CONCAT_DESCRIPTION were renamed into
MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION
|
2019-03-22 13:00:48 +01:00 |
|
Laurent Destailleur
|
a7181750c6
|
Merge pull request #10879 from altatof/noconcatdesc
NEW : add constant NO_CONCAT_DESCRIPTION
|
2019-03-22 12:56:46 +01:00 |
|
Laurent Destailleur
|
37cc5b7d35
|
Merge pull request #10901 from fmarcet/8.0
FIX: The minimum amount filter does not work in VAT report by customer
|
2019-03-22 12:27:30 +01:00 |
|
Ferran Marcet
|
f37c1b9287
|
FIX: The minimum amount filter does not work in the VAT report per customer
|
2019-03-22 09:28:50 +01:00 |
|
Laurent Destailleur
|
48a0c447b4
|
Fix test on draft status regression
|
2019-03-21 21:00:06 +01:00 |
|
Laurent Destailleur
|
ee4150665e
|
Fix phpcs
|
2019-03-21 20:15:19 +01:00 |
|
Laurent Destailleur
|
5693fbfe97
|
Merge pull request #10898 from grandoc/new_branch_21_03_2019
add some comments
|
2019-03-21 18:29:11 +01:00 |
|
Laurent Destailleur
|
47eb256b82
|
Fix phpcs
|
2019-03-21 18:22:17 +01:00 |
|
Laurent Destailleur
|
930720decd
|
WIP Start to replace use of property ->brouillon
|
2019-03-21 18:13:51 +01:00 |
|
Laurent Destailleur
|
90df30e412
|
NEW Add trigget FICHINTER_UNVALIDATE
Standardize code of setDraft.
|
2019-03-21 17:37:56 +01:00 |
|
Philippe GRAND
|
cb59f52a55
|
add some comments
|
2019-03-21 15:01:09 +01:00 |
|
Philippe GRAND
|
86c3b1a5b0
|
add some comments
|
2019-03-21 14:59:21 +01:00 |
|
Laurent Destailleur
|
5d21547854
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/product/price.php
htdocs/user/perms.php
|
2019-03-21 12:20:24 +01:00 |
|
Frédéric FRANCE
|
89e8889c5c
|
phpcs fix v9
|
2019-03-19 16:33:34 +01:00 |
|
Laurent Destailleur
|
eab11ce743
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.form.class.php
|
2019-03-19 13:14:44 +01:00 |
|
Laurent Destailleur
|
dbe15d3685
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-03-19 13:10:17 +01:00 |
|
Laurent Destailleur
|
b11403103b
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-03-19 13:09:48 +01:00 |
|
Laurent Destailleur
|
8664594fc8
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-03-19 13:09:39 +01:00 |
|
Laurent Destailleur
|
eaaea2c2f9
|
Fix set of due date when invoice created from API
|
2019-03-19 12:08:55 +01:00 |
|
Laurent Destailleur
|
bca10084c5
|
Merge pull request #10882 from alexandreaj/patch-1
Update api_invoices.class.php
|
2019-03-19 12:07:16 +01:00 |
|
Laurent Destailleur
|
70cb042e58
|
Update api_invoices.class.php
|
2019-03-19 12:06:57 +01:00 |
|
Laurent Destailleur
|
b10690ce88
|
Merge pull request #10874 from grandoc/translation
translation
|
2019-03-19 11:14:40 +01:00 |
|
Laurent Destailleur
|
6bead00260
|
Better text
|
2019-03-19 10:27:36 +01:00 |
|
Laurent Destailleur
|
3f62098b81
|
Add hours in date
|
2019-03-19 10:14:13 +01:00 |
|
alexandreaj
|
9bb1ede65a
|
Update api_invoices.class.php
Adding possibility to set due date (date_lim_reglement field in mysql) via the API.
|
2019-03-18 21:11:13 +01:00 |
|
Laurent Destailleur
|
41c737a213
|
Fix, Oops, test was inverted
|
2019-03-18 20:16:19 +01:00 |
|
Laurent Destailleur
|
aa013ff753
|
Fix do we really must copy notes when creating an object from another
source object? Add a hack with hidden option to be able to change this.
|
2019-03-18 20:09:09 +01:00 |
|
Christophe Battarel
|
8b3fd2eacf
|
NEW : add constant NO_CONCAT_DESCRIPTION
|
2019-03-18 16:10:17 +01:00 |
|
Philippe GRAND
|
c13a1dbc63
|
translation
|
2019-03-18 13:45:24 +01:00 |
|
Philippe GRAND
|
0f03b16313
|
translation
|
2019-03-18 12:46:32 +01:00 |
|
Laurent Destailleur
|
89087c6847
|
Merge pull request #10800 from atm-quentin/FIX_wrong_vat_deposit_invoice
Wrong vat if deposit from propal with multiple vat
|
2019-03-18 11:14:11 +01:00 |
|
Regis Houssin
|
57091f08b0
|
FIX missing entity filter and wrong var name
|
2019-03-18 10:53:43 +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 |
|
Laurent Destailleur
|
1abfd1f58e
|
Add page to setup module debugbar
Fix CSS
|
2019-03-17 00:32:39 +01:00 |
|
Laurent Destailleur
|
7cdfff7263
|
Fix syntax error
|
2019-03-15 20:42:49 +01:00 |
|
Laurent Destailleur
|
875b5b6a8d
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/expensereport/card.php
htdocs/projet/card.php
htdocs/public/opensurvey/studs.php
|
2019-03-15 19:20:22 +01:00 |
|
Laurent Destailleur
|
39e24d30aa
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-03-15 19:18:30 +01:00 |
|
Laurent Destailleur
|
681d626284
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-03-15 19:17:31 +01:00 |
|
Laurent Destailleur
|
b33c366b02
|
Update card.php
|
2019-03-15 19:16:49 +01:00 |
|
Laurent Destailleur
|
c0b6699b25
|
All methods set_draft() were renamed into setDraft()
|
2019-03-15 19:01:40 +01:00 |
|
Laurent Destailleur
|
a2d6723ff3
|
WIP Link files to expense report lines
|
2019-03-15 15:07:52 +01:00 |
|
Laurent Destailleur
|
bcf0dd0168
|
Merge branch 'develop' into patch-5
|
2019-03-14 16:47:08 +01:00 |
|
Laurent Destailleur
|
cdf6e4b65a
|
Fix some PSR rules
|
2019-03-14 16:43:27 +01:00 |
|
Frédéric FRANCE
|
321a919fb1
|
Update result.php
|
2019-03-14 16:42:35 +01:00 |
|
florian HENRY
|
9bcb91a122
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
|
2019-03-14 13:02:09 +01:00 |
|
gauthier
|
a524bbc5c6
|
FIX : when we create deposit with multi tva, we mustn't add line if amount = 0 (example when we have a 100% reduc on one of origin invoice line)
|
2019-03-13 15:59:41 +01:00 |
|
Laurent Destailleur
|
eeafc3c630
|
Standardize translation of amount
|
2019-03-13 14:10:36 +01:00 |
|
Laurent Destailleur
|
98ca9bf17a
|
Reduce quantity of string to translates
|
2019-03-12 19:44:59 +01:00 |
|
florian HENRY
|
9968fae9dc
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
|
2019-03-12 17:25:00 +01:00 |
|
Joan Louis
|
17647de4cc
|
Fix extrafields calls from cards for Dolibarr 8 See #10803
|
2019-03-12 11:24:54 +01:00 |
|
Joan Louis
|
f326c75be7
|
Update call to extrafields from cards
|
2019-03-11 21:34:16 +01:00 |
|
florian HENRY
|
53a76e91b4
|
fix missing test on method result
|
2019-03-11 21:25:51 +01:00 |
|
Joan Louis
|
ee5753819e
|
Update call to extrafields from cards
|
2019-03-11 14:22:04 +01:00 |
|
atm-quentin
|
ab781c32c7
|
Wrong vat if deposit from propal with multiple vat
|
2019-03-11 11:28:25 +01:00 |
|
Laurent Destailleur
|
f3ca69522e
|
Fix phpcs
|
2019-03-11 01:41:09 +01:00 |
|
Alexandre SPANGARO
|
ad485b55b6
|
NEW: Add category to bank transaction in various payment
|
2019-03-10 20:01:39 +01:00 |
|
Laurent Destailleur
|
9a5497b940
|
Merge pull request #10776 from frederic34/patch-3
do not trim int
|
2019-03-08 19:38:44 +01:00 |
|
Frédéric FRANCE
|
3dd4f0bfff
|
do not trim int
|
2019-03-07 22:17:48 +01:00 |
|
Frédéric FRANCE
|
d96cc53f97
|
replace html by html5 in fourn
|
2019-03-07 20:46:38 +01:00 |
|
Laurent Destailleur
|
1fb86e12e5
|
Merge manually some enhancement from #10507
|
2019-03-07 13:02:51 +01:00 |
|
Laurent Destailleur
|
a426c8e9bf
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/compta/facture/class/facture.class.php
htdocs/filefunc.inc.php
htdocs/install/upgrade2.php
htdocs/product/class/product.class.php
|
2019-03-07 11:16:24 +01:00 |
|
Laurent Destailleur
|
b15e00cae7
|
FIX Autodetect buy price for invoices autogenerated with templates.
|
2019-03-06 21:39:09 +01:00 |
|
Frédéric FRANCE
|
f283782445
|
change visibility
|
2019-03-04 19:57:46 +01:00 |
|
Laurent Destailleur
|
63d14b16c9
|
FIX The notes was also copied on invoice
|
2019-03-04 14:56:39 +01:00 |
|
Laurent Destailleur
|
db13e54724
|
FIX The notes was also copied on invoice
|
2019-03-04 14:54:59 +01:00 |
|