Laurent Destailleur
44c967f1cc
Merge pull request #12716 from Dolibarr/scrutinizer-patch-19
...
Scrutinizer Auto-Fixes
2019-12-16 19:01:53 +01:00
Laurent Destailleur
c3cd6ad1af
Fix example
2019-12-16 13:10:57 +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
Frédéric FRANCE
9e4fb8d4fe
doxygen
2019-12-15 10:02:20 +01:00
Frédéric FRANCE
8c7f0e669b
Update mod_chequereceipt_mint.php
2019-12-14 16:13:48 +01:00
Frédéric FRANCE
440b846e9a
Update mod_chequereceipt_mint.php
2019-12-14 16:12:38 +01:00
Frédéric FRANCE
ddc827e48e
Update mod_chequereceipt_thyme.php
2019-12-14 16:11:27 +01:00
Frédéric FRANCE
f15d65c2b9
doxygen
2019-12-14 16:09:48 +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
a0d9a7a970
Merge pull request #12704 from frederic34/patch-20
...
The property db does not exist on mod_arctic
2019-12-14 13:55:08 +01:00
Laurent Destailleur
835d22f556
Merge branch 'develop' into doxygen_todo
2019-12-14 13:46:40 +01:00
Frédéric FRANCE
57055bad03
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-13 14:36:00 +01:00
Frédéric FRANCE
a3dd454f86
The property db does not exist on mod_arctic
2019-12-13 08:00:34 +01:00
Frédéric FRANCE
a63caf38d3
The variable $conf seems to be never defined
2019-12-12 20:39:28 +01:00
Laurent Destailleur
a612aefab7
Fix HTML5
2019-12-12 11:11:08 +01:00
Laurent Destailleur
ce47de453e
Fix HTML5
2019-12-12 10:31:08 +01:00
Frédéric FRANCE
12f84d8254
doxygen
2019-12-11 23:04:27 +01:00
Mistral Oz - LWEP
b92ec604ec
New model "Excel 2007" : first col at wrong position
...
The first column start at id 0 instead of id 1. At id 0, the first column move at Z position.
Documentation : https://phpspreadsheet.readthedocs.io/en/latest/topics/migration-from-PHPExcel/#column-index-based-on-1
2019-12-10 18:25:30 +01:00
Laurent Destailleur
dfeca5fae8
Fix phpcs
2019-12-09 17:42:38 +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
d73bd3ee9a
Fix a supplier ref is mandatory for import
2019-12-06 18:43:13 +01:00
Laurent Destailleur
ed4f04f90a
Fix a supplier ref is mandatory for import
2019-12-06 18:41:22 +01:00
Frédéric FRANCE
4c5c6b6ff1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-03 17:56:43 +01:00
Laurent Destailleur
606a13898c
Merge pull request #12394 from mapiolca/patch-15
...
Fix problem of display photo in the model
2019-12-03 16:16:57 +01:00
Laurent Destailleur
41a176ce72
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/remx.php
htdocs/core/modules/modStripe.class.php
htdocs/product/stock/replenish.php
htdocs/stripe/payout.php
2019-12-03 13:58:15 +01:00
Laurent Destailleur
b1f2495771
Merge pull request #12598 from frederic34/patch-15
...
The property db does not exist on mod_livraison_saphir
2019-12-03 13:26:16 +01:00
Laurent Destailleur
87aaa5b11d
Merge pull request #12597 from frederic34/patch-14
...
The property db does not exist on mod_supplier_proposal_saphir
2019-12-03 13:26:03 +01:00
Laurent Destailleur
9400d44f83
Merge pull request #12596 from frederic34/patch-13
...
The property db does not exist on mod_reception_moonstone
2019-12-03 13:25:51 +01:00
Laurent Destailleur
a56d4407ca
Merge branch 'develop' into patch-11
2019-12-03 13:25:19 +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
ptibogxiv
b67fb8be02
Fix stripe menu
2019-12-03 00:14:05 +01:00
Laurent Destailleur
32a539a8c0
Update website templates
2019-12-02 09:19:05 +01:00
Frédéric FRANCE
0b37d54841
The property db does not exist on mod_livraison_saphir
2019-12-01 20:58:45 +01:00
Frédéric FRANCE
5d9901bf59
The property db does not exist on mod_supplier_proposal_saphir
2019-12-01 20:57:14 +01:00
Frédéric FRANCE
318ba895e5
The property db does not exist on mod_reception_moonstone
2019-12-01 20:55:22 +01:00
Frédéric FRANCE
c780838e34
The property db does not exist on mod_propale_saphir
2019-12-01 20:50:18 +01:00
Laurent Destailleur
5cb014435b
Try better fix for #12567
2019-12-01 19:29:53 +01:00
Frédéric FRANCE
1d0900445b
The variable $letter does not seem...
...
The variable $letter does not seem to be defined for all execution paths
2019-12-01 18:52:50 +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
Maxime Kohlhaas
edb8bcb598
Fix PDF rouget for SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME
2019-11-30 22:58:32 +01:00
Laurent Destailleur
eed8f242b8
Update demo
2019-11-29 10:23:18 +01:00
Laurent Destailleur
1636d341c7
Debug module BOM
...
Enhance demo data for TakePOS
2019-11-28 15:18:14 +01:00
Scrutinizer Auto-Fixer
5f99e25c45
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-28 11:36:20 +00:00
Frédéric FRANCE
b2912e688b
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-27 22:54:05 +01:00
Frédéric FRANCE
32aca5f186
Update pdf_standard.class.php
2019-11-26 19:52:10 +01:00
Laurent Destailleur
b0b579bdbf
Fix phpcs
2019-11-26 09:13:35 +01:00
Frédéric FRANCE
4c4ae5b6e1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-26 08:10:40 +01:00
Laurent Destailleur
61f414488a
Fix translation
2019-11-24 18:34:07 +01:00
Laurent Destailleur
712ae48e4e
Fix default setup
2019-11-24 18:07:38 +01:00
Alexandre SPANGARO
2f064567ef
NEW Add shipment widget
2019-11-21 07:50:44 +01:00
Frédéric FRANCE
2e5f539b2a
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-18 17:45:52 +01:00
Laurent Destailleur
ae0fdf014f
Debug email collector. Missing unique key. Fix initial setup.
2019-11-18 11:55:22 +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
1f5bea01f5
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/product/fournisseurs.php
htdocs/user/card.php
2019-11-14 21:30:16 +01:00
Laurent Destailleur
80b3e27341
Fix bad name of constant
2019-11-14 14:23:48 +01:00
Laurent Destailleur
7e0ae4bf0e
FIX The pdf templates were using the large logo making PDF too large
2019-11-14 14:17:22 +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
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
Frédéric FRANCE
05ab4f79ef
categories for actioncomm
2019-11-13 18:44:11 +01: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
Scrutinizer Auto-Fixer
038bda254d
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-11 22:59:36 +00:00
Laurent Destailleur
2ccef4e469
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
2019-11-11 19:10:35 +01:00
Laurent Destailleur
5b6ace387e
Debug BOM and MO module
2019-11-09 19:47:49 +01:00
Pierre Ardoin
88fb094a78
Fix problem of display photo in the model
...
Fix a problem with photo in the model :
Before : Check in the current entity the product's repertory to find a photo
Now : Check all entities product's repertories to find a photo
2019-11-08 22:02:30 +01:00
Laurent Destailleur
8f35c24b62
Add quick hack by hidden const as solution when numbering is locked.
2019-11-08 16:37:25 +01:00
Laurent Destailleur
e513917d12
Fix phpcs
2019-11-08 11:34:14 +01:00
Laurent Destailleur
3b44760e65
FIX #12356
2019-11-07 14:10:07 +01:00
Laurent Destailleur
f84087ba70
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-11-07 14:08:01 +01:00
Laurent Destailleur
1fa61077a0
FIX #12356
2019-11-07 14:07:50 +01:00
Scrutinizer Auto-Fixer
0b406172fd
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-07 11:59:59 +00:00
Laurent Destailleur
7c4942b7be
Fix debug BOM/MO
2019-11-05 20:14:33 +01:00
Laurent Destailleur
84a8d4e7cb
Debug BOM/MO
2019-11-05 19:18:12 +01:00
Laurent Destailleur
c0daa1e5d3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-11-05 10:11:49 +01:00
Laurent Destailleur
b4d72e3e96
Fix link to setup of social network module
2019-11-05 10:00:46 +01:00
Frédéric FRANCE
d035aefd40
config file doesn't exists
2019-11-04 21:58:40 +01:00
Laurent Destailleur
1aef1c60dd
Merge pull request #11867 from frederic34/socialnetworks
...
NEW add socialnetworks dictionary
2019-11-04 21:10:22 +01:00
Laurent Destailleur
b0ea276233
Debug MO module
2019-11-04 14:13:36 +01:00
Frédéric FRANCE
872f58f261
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-11-03 21:48:24 +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
58ffb73627
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-11-02 12:59:49 +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
68691ddd8a
Merge pull request #12265 from grandoc/new_branch_30_10_2019
...
add comment
2019-11-02 11:49:28 +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
b8803fa8df
Work on MO
2019-10-31 22:56:08 +01:00
Laurent Destailleur
716c2bb531
Work on MO
2019-10-31 22:46:34 +01:00
Laurent Destailleur
af09c77a0c
Fix phpcs
2019-10-31 22:15:18 +01:00
Laurent Destailleur
c215d534fc
Fix phpcs
2019-10-31 21:16:41 +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
b296f62671
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
2019-10-31 02:36:31 +01:00
Laurent Destailleur
645390c990
Work on BOM templates
2019-10-31 02:36:16 +01:00
Frédéric FRANCE
f7747ed00a
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-30 20:06:43 +01:00
stickler-ci
ed9a136211
Fixing style errors.
2019-10-30 08:58:19 +00:00
Philippe GRAND
445d09cf8a
add comment
2019-10-30 09:50:06 +01:00
Philippe GRAND
a80243e528
add comment
2019-10-30 09:48:34 +01:00
Laurent Destailleur
6a01132fdb
Merge pull request #12210 from grandoc/new_branch_24_10_2019
...
add some comment
2019-10-30 03:17:21 +01:00
Laurent Destailleur
66a288a343
Merge pull request #12235 from frederic34/scopeindent
...
clean indent
2019-10-30 02:57:59 +01:00
Laurent Destailleur
bc3f088f50
Enhance modulebuilder
...
Work on MO
2019-10-30 01:35:41 +01:00
Laurent Destailleur
66337ec234
NEW Add widgets for BOMs and MOs
2019-10-30 00:36:47 +01:00
Frédéric FRANCE
1ba9612f12
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-27 17:03:50 +01:00
Frédéric FRANCE
8f6d38ee82
clean indent
2019-10-27 17:01:23 +01:00
Laurent Destailleur
afa3ed499f
Can export BOMs
2019-10-27 15:56:20 +01:00
Frédéric FRANCE
a43e6f96b5
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-25 08:12:54 +02:00
Philippe GRAND
5e44d63ec0
Merge remote-tracking branch 'upstream/develop' into new_branch_24_10_2019
2019-10-24 16:24:17 +02:00
Laurent Destailleur
88e848e346
FIX Extrafields missing in export of expense report
2019-10-24 16:00:10 +02:00
Laurent Destailleur
15609e319f
FIX Extrafields missing in export of expense report
2019-10-24 15:57:34 +02:00
Philippe GRAND
ac839204d7
add some comment
2019-10-24 15:12:20 +02:00
Philippe GRAND
ffa5c8cbc0
add some comment
2019-10-24 15:10:05 +02:00
stickler-ci
3fb0b1ac73
Fixing style errors.
2019-10-24 13:07:19 +00:00
Philippe GRAND
480e21b88a
add some comment
2019-10-24 15:06:56 +02:00
stickler-ci
9eb0385a88
Fixing style errors.
2019-10-24 13:02:34 +00:00
Philippe GRAND
f1db8e6f03
add some comment
2019-10-24 15:02:37 +02:00
stickler-ci
8a7360dd32
Fixing style errors.
2019-10-24 12:59:20 +00:00
Philippe GRAND
96ab43d495
add some comment
2019-10-24 14:58:15 +02:00
Laurent Destailleur
f23804a091
FIX #12152
2019-10-23 03:00:19 +02:00
Laurent Destailleur
fea12076ee
FIX #12152
2019-10-22 20:24:52 +02:00
Laurent Destailleur
c4be61c55c
FIX Better compatible fix for the trouble of weight / size units
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/product/card.php
2019-10-22 18:42:59 +02:00
Laurent Destailleur
e7e9898e0d
FIX Better compatible fix for the trouble of weight / size units
2019-10-22 18:36:36 +02:00
Philippe GRAND
a0303e903a
internationalization
2019-10-21 09:53:42 +02:00
Philippe GRAND
db22cdb8ea
internationalization
2019-10-21 09:43:34 +02:00
Frédéric FRANCE
86f22c4563
do not ignore lines with mix od tabs and spaces
2019-10-20 17:17:22 +02:00
Frédéric FRANCE
9ec7836387
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-20 16:37:18 +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
Laurent Destailleur
becd3f7d2f
FIX Missing status and paid flag in export or expense report
2019-10-18 15:35:25 +02:00
Philippe GRAND
a07ab341f8
Standardization
2019-10-18 13:00:31 +02:00
Philippe GRAND
41d2cb2c29
Standardization
2019-10-18 12:56:40 +02:00
Philippe GRAND
f43d51bfec
Standardization
2019-10-18 12:51:49 +02:00
Philippe GRAND
731f4587e2
Merge remote-tracking branch 'origin/new_branch_18_10_2019' into new_branch_18_10_2019
2019-10-18 12:44:40 +02:00
Philippe GRAND
18b183f516
Standardization
2019-10-18 12:43:25 +02:00
stickler-ci
0c61e798a6
Fixing style errors.
2019-10-18 09:42:15 +00:00
Philippe GRAND
3b56d91727
Standardization
2019-10-18 11:41:18 +02:00
Frédéric FRANCE
f4540dddb8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-17 20:24:04 +02:00
Laurent Destailleur
de396dc9b3
Clean code for order of modules
2019-10-17 19:21:30 +02:00
Laurent Destailleur
87ec1de78e
Start to work on solution to sort permissions by module
2019-10-17 18:43:07 +02:00
Laurent Destailleur
40fdcfac7e
Merge branch 'develop' into 10.0_closure2
2019-10-17 18:16:57 +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
f71423b3fd
Merge pull request #12160 from grandoc/new_branch_17_10_2019
...
Internationalization
2019-10-17 17:42:44 +02:00
Philippe GRAND
2efeeb0ad8
Internationalization
2019-10-17 14:47:03 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
2019-10-16 20:00:01 +02:00
TuxGasy
43ce1543d8
Fix width unit label in product import
2019-10-16 17:37:20 +02:00
Philippe GRAND
10fd472392
internationalization
2019-10-16 15:59:08 +02:00
Philippe GRAND
cd825ba4be
internationalization
2019-10-16 15:46:46 +02:00
Laurent Destailleur
2aa594de9d
Merge pull request #12124 from c3do/patch-1
...
New: Set a pricing rule by default for new clean installation
2019-10-16 13:25:44 +02:00
Laurent Destailleur
d7871c4971
Merge pull request #12132 from grandoc/new_branch_15_10_2019
...
Internationalization
2019-10-16 13:24:10 +02:00
Laurent Destailleur
e07e01580d
Replace deprecated code with new one
2019-10-16 03:34:32 +02:00
Laurent Destailleur
b0de030f3e
phpcs
2019-10-16 02:05:47 +02:00
Laurent Destailleur
ffc4820970
Fix counter of BOM
2019-10-16 02:05:23 +02:00
Frédéric FRANCE
d1d9b1ed85
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-15 09:39:57 +02:00
Laurent Destailleur
fb3d20107c
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/exports/export.php
htdocs/filefunc.inc.php
2019-10-15 03:51:57 +02:00
stickler-ci
30099a821b
Fixing style errors.
2019-10-14 19:39:00 +00:00
Philippe GRAND
6761e1ef33
Internationalization
2019-10-14 21:38:21 +02:00
Philippe GRAND
7ce5ddbf02
Internationalization
2019-10-14 21:25:43 +02:00
Laurent Destailleur
07bb83a96d
Merge pull request #12113 from aspangaro/10.0_p25
...
Remove a duplicate line
2019-10-14 21:04:22 +02:00
Laurent Destailleur
4941a99cc7
Merge pull request #12126 from grandoc/new_branch_14_10_2019
...
add missing translation
2019-10-14 20:53:28 +02:00
Laurent Destailleur
5a55997540
Update pdf_eratosthene.modules.php
2019-10-14 20:53:18 +02:00
Laurent Destailleur
5c4edad0d4
Merge pull request #12105 from grandoc/new_branch_12_10_2019
...
more internationalization
2019-10-14 20:37:50 +02:00
Frédéric FRANCE
2351750d2b
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-14 19:02:46 +02:00
Philippe GRAND
fd90ebe63b
add missing translation
2019-10-14 15:57:29 +02:00
Philippe GRAND
e326c23245
add missing translation
2019-10-14 15:48:24 +02:00
Cédric
44476afdac
FIX: No pricing rule on new clean installation
...
There is no pricing rule on new fresh installation of Dolibarr.
I think the pricing rule "PRODUCT_PRICE_UNIQ" should be set by default because it is needed to update a product through API REST.
2019-10-14 15:35:04 +02:00
Laurent Destailleur
a33fb47777
Work on MO module
2019-10-14 12:10:14 +02:00
Alexandre SPANGARO
e50d32dc00
Remove a duplicate line
2019-10-13 13:20:45 +02:00
Alexandre SPANGARO
499eb87173
lang file for holidays is holiday
2019-10-13 08:20:37 +02:00
Frédéric FRANCE
d9ba09bec1
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-12 19:02:24 +02:00
Philippe GRAND
33efd77fc7
more internationalization
2019-10-12 12:10:33 +02:00
Frédéric FRANCE
9f59656589
fix typo inspired by grandoc
2019-10-11 23:08:33 +02:00
Laurent Destailleur
2fa3b23cf1
Fix missing price level field
2019-10-11 19:36:36 +02:00
Laurent Destailleur
f334180cb8
Merge pull request #12072 from OPEN-DSI/new-categorie-import-parent
...
NEW add parent category id or label in import category module
2019-10-11 17:33:28 +02:00
Laurent Destailleur
fa928f7dc3
Update modCategorie.class.php
2019-10-11 17:33:13 +02:00
Frédéric FRANCE
367ef4acaf
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-11 16:44:25 +02:00
Laurent Destailleur
a0f918c85a
Merge pull request #12094 from grandoc/new_branch_11_10_2019
...
fix some translations
2019-10-11 16:21:06 +02:00
VESSILLER
2fb776ee34
NEW add new rule fetchidfromcodeandlabel for categories import
2019-10-11 11:57:11 +02:00
Philippe GRAND
25b9be9de7
update code
2019-10-11 10:19:58 +02:00
Frédéric FRANCE
03bbfc6ad9
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-10 23:24:50 +02:00
Frédéric FRANCE
9a2fabff6f
doxygen
2019-10-10 18:42:29 +02:00
Laurent Destailleur
b34cbfad74
Rename const
2019-10-10 15:23:45 +02:00
Laurent Destailleur
d9a0dc2986
Fix trans
2019-10-10 15:20:44 +02:00
Laurent Destailleur
aebae5ff83
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/margins.lang
htdocs/user/class/user.class.php
2019-10-10 10:37:17 +02:00
VESSILLER
d77f7556d8
NEW add parent category id or label in import category module
2019-10-09 16:00:14 +02:00
Laurent Destailleur
9f4aadae18
Missing Nature, Duration and Type fields in export of products
2019-10-09 02:05:20 +02:00
Frédéric FRANCE
f253315c8d
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-08 18:30:58 +02:00
Laurent Destailleur
138ac0d524
Merge pull request #12063 from laudeco/feature/export_user_bank_account
...
NEW Add bank data of user into the expense report exports
2019-10-08 15:19:46 +02:00
Laurent Destailleur
651dec8dc2
Doxygen
2019-10-08 11:27:52 +02:00
Laurent Destailleur
43a70e5548
Clean code to use the new $extrafields->attributes array
2019-10-08 09:28:50 +02:00
Laurent De Coninck
c8fb1e852c
export some other fields on the expense reports
...
When the user requests the export of the expense reports, some fields
were missing such as the bank account information of the user.
This PR adds the support of all those fields on the expense report
export. Now when you export the expense report you have :
* The bank name
* The bank code
* The IBAN
* The BIC
* The owner
* The owner address
2019-10-08 08:51:09 +02:00
Frédéric FRANCE
b78187c1eb
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-08 00:07:27 +02:00
Laurent Destailleur
51be0fad99
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-10-07 20:52:39 +02:00
Laurent Destailleur
bb72efefc5
Fix phpcs
2019-10-07 20:52:27 +02:00
Laurent Destailleur
e5026157e3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2019-10-07 20:49:30 +02:00
Laurent Destailleur
539f4355c3
Try to fix stickler
2019-10-07 20:48:44 +02:00
Laurent Destailleur
156eb7fa61
Merge branch '10.0' into hotfix/12041-security-generate-password
2019-10-07 20:22:19 +02:00
Laurent De Coninck
2ba8506608
validate the 0 as min value consecutive; meaning not take that rule into account
2019-10-07 17:53:23 +02:00
Laurent Destailleur
035da6a711
Merge pull request #11951 from aspangaro/11.0_accountancy_portal
...
NEW Accountancy - Add an option to hide FAQ on index and add specific widget in this area
2019-10-07 14:24:22 +02:00
Laurent Destailleur
12d243b8d4
FIX #12040
2019-10-07 13:13:46 +02:00
Laurent Destailleur
71e922635b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-10-07 12:57:52 +02:00
Laurent Destailleur
7015e71105
FIX #12041
2019-10-07 12:53:32 +02:00
Laurent Destailleur
e7aa78cb4a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-10-07 12:37:20 +02:00
Laurent Destailleur
23de8694fa
Fix module files
2019-10-07 12:37:01 +02:00
Laurent Destailleur
f4b752ee81
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/import/import_csv.modules.php
htdocs/core/modules/import/import_xlsx.modules.php
htdocs/core/modules/modProduct.class.php
htdocs/expedition/card.php
2019-10-07 12:33:13 +02:00
VESSILLER
219b0d8925
FIX Import of product using units
2019-10-07 12:26:02 +02:00
Laurent Destailleur
b85c4f0864
Merge branch 'develop' into new-import-product-country-code
2019-10-07 10:41:35 +02:00
Laurent Destailleur
c3ae87816f
Merge pull request #12049 from frederic34/holidayz
...
lang file for holidays is holiday
2019-10-07 10:21:36 +02:00
Frédéric FRANCE
ec8569dd85
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-06 15:56:21 +02:00
Laurent Destailleur
2b66282b61
NEW Code for extrafields uses the new array $extrafields->attributes
2019-10-06 14:41:52 +02:00
Frédéric FRANCE
8a9f08d5a3
lang file for holidays is holiday
2019-10-06 11:29:24 +02:00
Frédéric FRANCE
6384e7eb67
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-05 20:02:16 +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
VESSILLER
0e23fbc6df
NEW add country code in import product model
2019-10-04 10:04:02 +02:00
Frédéric FRANCE
98023353fe
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-03 17:21:31 +02:00
Sebastien Baguet
9daffcbe07
Fix for no subscription members
2019-10-03 00:29:41 +02:00
Alexandre SPANGARO
848acb6096
Update index
2019-10-02 08:49:33 +02:00
Alexandre SPANGARO
a6e429ff32
Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal
2019-10-02 08:49:00 +02:00
Frédéric FRANCE
aca9d92db8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-01 22:03:33 +02:00
Frédéric FRANCE
c57c8eee88
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-01 07:41:10 +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
Alexandre SPANGARO
8dea427f58
Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal
2019-09-30 21:23:27 +02:00
Laurent Destailleur
0846a081cb
Merge branch 'develop' into new_branch_29_06_2019
2019-09-30 21:06:51 +02:00
Frédéric FRANCE
b87610adcc
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-30 19:34:35 +02:00
Laurent Destailleur
33908afb66
Update zapier logo
2019-09-30 19:30:31 +02:00
Frédéric FRANCE
258424416e
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-30 07:49:52 +02:00
Alexandre SPANGARO
8e42ac8cd0
Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal
2019-09-28 22:31:08 +02:00
Frédéric FRANCE
cea3669ffa
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-28 00:35:14 +02:00
Laurent Destailleur
981c5c877a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-09-27 20:02:08 +02:00
Laurent Destailleur
24ad67e0e1
Fix missing $conf
2019-09-27 20:01:57 +02:00
Laurent Destailleur
d0d884742f
FIX #11861 Not consistent code to manage measuring units
2019-09-27 19:45:33 +02:00
Laurent Destailleur
c0e7c558a1
Merge pull request #11860 from atm-john/new_box_supplier_orders_awaiting_reception
...
NEW widget box for supplier orders awaiting reception
2019-09-27 15:32:43 +02:00
Laurent Destailleur
8e08636d36
Merge pull request #11922 from laudeco/feature/11880_add_custom_element_in_project_export
...
[#11880 ] - support the referents also in the beluga export of a project
2019-09-27 14:22:49 +02:00
Laurent Destailleur
138b494b98
Merge pull request #11936 from aspangaro/11.0_translation
...
Translate and some fix
2019-09-27 12:15:50 +02:00
Laurent Destailleur
881c90ab74
Merge pull request #11953 from grandoc/new_branch_24_09_2019
...
add missing translation
2019-09-27 11:56:01 +02:00
Laurent Destailleur
2b6b1a3e1c
Fix syntax error
2019-09-27 11:12:21 +02:00
Frédéric FRANCE
03086026b8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-27 08:06:13 +02:00
Frédéric FRANCE
5eb0fb462b
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-27 07:59:02 +02:00
Laurent Destailleur
7d91649520
NEW Add extrafields in export of expense report (and holiday)
2019-09-25 15:48:44 +02:00
Frédéric FRANCE
41cb628d05
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-25 08:06:44 +02:00
Laurent Destailleur
961f2b5165
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/categories/viewcat.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/takepos/invoice.php
2019-09-24 14:25:02 +02:00
Philippe GRAND
7ec43e8b59
add missing translation
2019-09-24 09:54:57 +02:00
Alexandre SPANGARO
02dbc11f98
Move Gnu.org to https
2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
a005408d83
NEW Accountancy - Add an option to hide FAQ on index and add widget in area
2019-09-23 20:42:50 +02:00
Alexandre SPANGARO
1e49fd0d45
Translate
2019-09-20 15:07:58 +02:00
Alexandre SPANGARO
e32772fdc5
Translate
2019-09-20 09:44:49 +02:00
