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
|
44400b7866
|
FIX : Some issues on salary payment
|
2019-12-24 07:22:25 +01:00 |
|
Alexandre SPANGARO
|
ab0f77b467
|
Merge remote-tracking branch 'upstream/develop' into 11.0_a5
|
2019-12-23 21:15:17 +01:00 |
|
Alexandre SPANGARO
|
384651db46
|
Merge remote-tracking branch 'upstream/develop' into 11.0_a2
|
2019-12-23 21:01:17 +01:00 |
|
Laurent Destailleur
|
9a08a6bf6d
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/categories/traduction.php
htdocs/compta/facture/class/facture.class.php
htdocs/contact/card.php
htdocs/core/modules/modSociete.class.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/langs/en_US/products.lang
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php
htdocs/margin/tabs/thirdpartyMargins.php
|
2019-12-23 14:13:26 +01:00 |
|
VESSILLER
|
c39e45b81a
|
FIX set due date in object in create invoice
|
2019-12-23 10:57:51 +01:00 |
|
Laurent Destailleur
|
daae053e39
|
Debug CashFence feature
|
2019-12-22 20:02:18 +01:00 |
|
Laurent Destailleur
|
3036ff637f
|
Fix bad url
|
2019-12-22 19:49:39 +01:00 |
|
Laurent Destailleur
|
3ae5901a64
|
Fix look and feel v11
|
2019-12-22 19:46:36 +01:00 |
|
Laurent Destailleur
|
dd9f25b13a
|
CSS
|
2019-12-22 16:33:15 +01:00 |
|
Laurent Destailleur
|
39737c7c4b
|
Fix opacity on text with a href links inside
Fix var not defined
|
2019-12-22 13:19:14 +01:00 |
|
Laurent Destailleur
|
d9a1e1b348
|
Fix several non dolibarr behaviour on input of salary payments
|
2019-12-19 10:01:11 +01:00 |
|
Laurent Destailleur
|
f44b85f557
|
Fix $_SESSION['newtoken'] must be newToken()
|
2019-12-18 23:12:31 +01:00 |
|
Laurent Destailleur
|
db5672ae90
|
Fix creation/update of expense reports
Fix export of accounting documents
|
2019-12-18 23:07:26 +01:00 |
|
Scrutinizer Auto-Fixer
|
455178ff73
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-12-18 14:20:36 +00:00 |
|
Laurent Destailleur
|
138215fc3f
|
Add INVOICE_ALLOW_FREE_REF as a quick hack to solve trouble with non
european users.
|
2019-12-16 22:30:16 +01:00 |
|
Scrutinizer Auto-Fixer
|
c8baaa2995
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-12-16 12:06:25 +00:00 |
|
Laurent Destailleur
|
49a8b4544e
|
Fix look and feel v11
|
2019-12-15 19:32:37 +01:00 |
|
Laurent Destailleur
|
9685b56375
|
Fix warning
|
2019-12-15 15:03:22 +01:00 |
|
Laurent Destailleur
|
838633d0de
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/api/class/api_setup.class.php
htdocs/compta/facture/card.php
htdocs/compta/stats/index.php
htdocs/core/actions_massactions.inc.php
htdocs/install/upgrade2.php
htdocs/loan/card.php
htdocs/loan/document.php
htdocs/loan/info.php
htdocs/loan/note.php
htdocs/loan/schedule.php
htdocs/product/list.php
htdocs/ticket/card.php
htdocs/user/class/user.class.php
|
2019-12-14 14:53:49 +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 |
|
Regis Houssin
|
a527e72124
|
FIX #12688
|
2019-12-12 16:35:07 +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 |
|
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 |
|