Laurent Destailleur
17b68a30d7
Merge branch 'develop' into dev_add_tag_on_massaction
2020-12-30 13:10:02 +01:00
Regis Houssin
7832fa213f
FIX Stickler line exceeds 500 characters; contains 527 characters
2020-12-30 11:34:59 +01:00
Regis Houssin
7c5248d105
FIX and the world turn again
2020-12-30 11:27:03 +01:00
Regis Houssin
aec01a95fc
FIX again and again
2020-12-29 17:48:52 +01:00
Regis Houssin
acabb045fb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0
2020-12-29 17:12:18 +01:00
Laurent Destailleur
cefd66c18f
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-12-29 16:56:39 +01:00
Regis Houssin
20cd9cbbc7
FIX avoid warning php 8.0
2020-12-29 16:25:29 +01:00
Regis Houssin
6e0832fb38
FIX WIP avoid warning with php 8.0
2020-12-29 15:59:39 +01:00
Alexandre SPANGARO
9f0434eb69
Merge remote-tracking branch 'upstream/develop' into 14a2
2020-12-29 04:50:32 +01:00
Florian HENRY
1e438b686e
fix stickler
2020-12-28 21:32:46 +01:00
Florian HENRY
806b40662f
merge develop
2020-12-28 21:15:25 +01:00
Laurent Destailleur
8b696ced3b
Clean code
2020-12-28 12:38:33 +01:00
Laurent Destailleur
1546805b9e
Merge pull request #15500 from frederic34/patch-10
...
NEW add db fields note_public note_private for ecm
2020-12-27 15:07:51 +01:00
Florian HENRY
1b6a4fc4ae
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_add_tag_on_massaction
2020-12-24 15:00:15 +01:00
Laurent Destailleur
5ef3ffbdc6
Fix warning
2020-12-24 03:03:38 +01:00
Laurent Destailleur
6c2a17b29a
Fix warning
2020-12-24 02:59:00 +01:00
Florian HENRY
720539ff46
on goung
2020-12-23 23:52:43 +01:00
Florian HENRY
26d3ea2227
on going
2020-12-23 23:32:50 +01:00
Laurent Destailleur
02daf09928
Fix for php8
2020-12-23 23:06:34 +01:00
Laurent Destailleur
4471d7d1da
FIX debug report expense/income
2020-12-23 22:18:38 +01:00
Laurent Destailleur
d65dc85a10
FIX for php 8
2020-12-23 19:16:25 +01:00
Florian HENRY
311a555cc0
Merge github.com:Dolibarr/dolibarr into dev_exfields_of_lines_into_line_tr
2020-12-22 12:52:14 +01:00
Florian HENRY
fefc9040ab
NEW : Display extrafields (for lines/det into line tr instead of ugly other tr
2020-12-22 12:52:01 +01:00
Florian Mortgat
64a62bf2c2
FIX (PR #15346 comment) use dol_mktime, not mktime
2020-12-22 09:37:30 +01:00
Laurent Destailleur
04d249cef0
Merge pull request #15792 from frederic34/notifications
...
simplify notications class
2020-12-21 18:14:04 +01:00
Laurent Destailleur
7d0e71165a
Clean code
2020-12-21 14:40:27 +01:00
Laurent Destailleur
7fae5ea800
Code clean
2020-12-20 18:21:34 +01:00
Frédéric FRANCE
b7b35f4cd4
simplify notications class
2020-12-20 11:04:21 +01:00
Laurent Destailleur
8d21eab6ab
Fix buttond not working
2020-12-20 06:06:24 +01:00
Laurent Destailleur
6066a92b9d
Fix API to get country
2020-12-19 22:34:33 +01:00
Laurent Destailleur
fe93ee4d08
Debug website module for multilanguage
2020-12-19 13:03:40 +01:00
Laurent Destailleur
90d8299c92
Fix purge tool
2020-12-18 13:24:02 +01:00
Laurent Destailleur
3b8947dadd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/class/html.form.class.php
htdocs/product/price.php
2020-12-17 21:50:05 +01:00
Laurent Destailleur
f10c69680c
Ajax combo at a better place (after select)
2020-12-17 21:42:10 +01:00
Laurent Destailleur
a67068ab7b
Fix warnings
2020-12-17 18:08:56 +01:00
Laurent Destailleur
b0d524beed
Debug v13
2020-12-17 11:57:12 +01:00
Laurent Destailleur
05cb2653f3
Merge pull request #15749 from StephaneLesage/companycard-directedit-type
...
Direct edition of type of company in card
2020-12-15 13:54:06 +01:00
Laurent Destailleur
2ae1aac5a4
Fix setup
2020-12-15 11:18:29 +01:00
Laurent Destailleur
f2a4f880ca
Fix warning
2020-12-15 10:49:07 +01:00
David Bensel
bc9f7c83f4
update
2020-12-14 22:40:47 +03:00
Laurent Destailleur
9595504b56
Fix graph
2020-12-14 19:57:59 +01:00
stickler-ci
d32d3060cc
Fixing style errors.
2020-12-14 09:15:06 +00:00
Stephane Lesage
5e4cc7fcfd
companycard-directedit-typent
2020-12-14 10:14:31 +01:00
Laurent Destailleur
d739fa1951
Fix log
2020-12-13 18:32:55 +01:00
Laurent Destailleur
3d33d3aa3a
Fix warning
2020-12-13 14:36:00 +01:00
Frédéric FRANCE
346fe8ae85
clean
2020-12-12 22:35:51 +01:00
Laurent Destailleur
3521a736fc
Fix warnings
2020-12-12 19:49:13 +01:00
Frédéric FRANCE
4664ac1a1c
socialnetworks links
2020-12-12 17:00:23 +01:00
Laurent Destailleur
9100e1410e
Fix translation, add comments and clean code, fix also a small
...
regression on colors for graph with lines
2020-12-11 17:59:18 +01:00
stickler-ci
5d86a5bd2a
Fixing style errors.
2020-12-11 16:44:38 +00:00
Florian HENRY
79b0f08a8d
Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_project_task_add_contact
2020-12-11 17:38:59 +01:00
Florian HENRY
0ed084d585
NEW: When add contact/user to Project, ask to also affect on project task
2020-12-11 17:38:38 +01:00
Laurent Destailleur
18efbebd02
css
2020-12-11 17:11:50 +01:00
Laurent Destailleur
91ddcf6446
Merge pull request #15724 from Hystepik/develop#1
...
Close #15383 : New format for funnel of prospection
2020-12-11 16:31:46 +01:00
Laurent Destailleur
ab0b508984
Merge pull request #15720 from zuiko/patch-1
...
V13 Update html.form.class.php to complete Fix #15565 Enhanced behaviour to select product on customer/supplier order to be able to use barcode reader efficiently
2020-12-11 16:31:19 +01:00
Laurent Destailleur
8a0c065163
Debug v13
2020-12-11 16:30:45 +01:00
Laurent Destailleur
2353ade957
Merge pull request #15732 from frederic34/patch-14
...
fix phpcs
2020-12-11 14:36:04 +01:00
Laurent Destailleur
2adbd29b49
Debug generation of doc from modulebuilder
2020-12-11 14:22:36 +01:00
Frédéric FRANCE
54d51ec557
Update html.form.class.php
2020-12-11 13:46:47 +01:00
Frédéric FRANCE
eb2d7fa657
fix phpcs
2020-12-11 13:43:03 +01:00
Laurent Destailleur
697ca3e4f5
Fix selection of duration type
2020-12-11 02:23:43 +01:00
Laurent Destailleur
2f8ee92c51
Fix CSS
2020-12-11 02:02:41 +01:00
Laurent Destailleur
206caec290
Debug v13
2020-12-11 01:20:40 +01:00
Laurent Destailleur
1f28590e5e
Fix style
2020-12-10 19:05:54 +01:00
Laurent Destailleur
df4d2e1b24
Fix path of user photo
2020-12-10 18:13:30 +01:00
stickler-ci
38e03778dc
Fixing style errors.
2020-12-10 10:07:09 +00:00
lmarcouiller
ecd642e465
Close #15383 : New format for funnel of prospection
2020-12-10 10:58:07 +01:00
zuiko
b3ca58d2d0
Update html.form.class.php
...
Complete the Fix to #15565 Enhanced behaviour to select product on customer/supplier order to be able to use barcode reader efficiently.
Answer to Eldy, https://github.com/Dolibarr/dolibarr/pull/15704#discussion_r538763166
In fact the change alone to htdocs/core/lib/ajax.lib.php is not, for me, sufficient to fix the issue.
if $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, the combo remains even if the product is alone.
So I recommend that the code is $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 1, (wihout combo) for product selection only for customer order filling because for this usage the the probability is higher to use a barcode scanner.
It is less relevant for filling supplier orders (which are not usually entered by barcode scanner), because the combo gives verification information which then disappears. (This is especially true for the purchase price, which is not pre-filled in the box for the moment I tested(?).
2020-12-09 21:16:25 +01:00
lmarcouiller
83286d99be
funnel horizontal bar
2020-12-09 13:31:14 +01:00
Laurent Destailleur
769a8886b9
Debug notification on events
2020-12-08 20:32:37 +01:00
Laurent Destailleur
791d129c9c
Merge pull request #15699 from hregis/fix_bcc_only_if_not_exists
...
FIX add autocopy to if not already exists in $to
2020-12-08 17:56:04 +01:00
Laurent Destailleur
8491be2572
Fix look and feel v13
2020-12-08 11:58:47 +01:00
Regis Houssin
fc34c97666
FIX add autocopy to if not already exists in $to
2020-12-08 08:49:06 +01:00
Laurent Destailleur
efc3bad7c6
Merge pull request #15678 from frederic34/fk_element
...
doxygen
2020-12-07 22:31:08 +01:00
Laurent Destailleur
ffa866585a
Update emailsenderprofile.class.php
2020-12-07 22:29:17 +01:00
Laurent Destailleur
6e403e6ce0
Fix warnings
2020-12-07 18:29:14 +01:00
Laurent Destailleur
e77413e1e4
Fix warning
2020-12-07 15:36:37 +01:00
Laurent Destailleur
d1c66059cd
Add missing tag order_ref and order_ref_customer on shipments for ODT
...
generation.
Conflicts:
htdocs/core/class/commondocgenerator.class.php
2020-12-06 19:03:46 +01:00
Laurent Destailleur
025cbe8557
Add missing tag order_ref and order_ref_customer on shipments for ODT
...
generation.
2020-12-06 19:01:09 +01:00
Laurent Destailleur
de61a7cfd3
Fix cleaning html tags with trans and with GETPOST.
2020-12-06 17:30:27 +01:00
Laurent Destailleur
1f83e22aea
Fix set of translation of website page during cloning
2020-12-06 15:59:19 +01:00
Frédéric FRANCE
fbc0be3a43
doxygen
2020-12-05 23:57:31 +01:00
Frédéric FRANCE
4e18f46f28
doxygen
2020-12-05 23:53:55 +01:00
Laurent Destailleur
15455690b9
Fix setup
2020-12-05 14:06:50 +01:00
Laurent Destailleur
af1bb09338
NEW: Graphics can be horizontal bars.
2020-12-04 22:30:34 +01:00
Laurent Destailleur
d8b01d9a33
Fix chart is default graph lib
2020-12-04 22:12:20 +01:00
Frédéric FRANCE
a2eab824c1
Merge remote-tracking branch 'upstream/develop' into patch-10
2020-12-04 20:42:22 +01:00
Laurent Destailleur
f0dec80dae
css
2020-12-04 15:39:30 +01:00
Laurent Destailleur
6d4a90b543
Clean code
2020-12-04 14:53:52 +01:00
Laurent Destailleur
040d22ef0a
Fix phpcs
2020-12-04 01:59:47 +01:00
Laurent Destailleur
5bd6d6f388
Look and feel v13
2020-12-03 14:34:15 +01:00
Laurent Destailleur
d88173d7ba
Fix bad column
2020-12-02 19:13:32 +01:00
Laurent Destailleur
9e18997e64
FIX #15595
2020-12-02 16:35:43 +01:00
Laurent Destailleur
49be354c3e
Fix warning
2020-12-02 14:05:17 +01:00
Laurent Destailleur
c5ff32c2d2
Fix accept <u> and <i> into translation strings
2020-12-01 17:01:35 +01:00
Laurent Destailleur
c0c03f5270
Fix allow tag <center> into translation strings
2020-12-01 15:59:54 +01:00
Laurent Destailleur
3b3f9acdbb
Remove warning
2020-12-01 11:36:58 +01:00
stickler-ci
7d966d7a49
Fixing style errors.
2020-12-01 01:42:18 +00:00
Scrutinizer Auto-Fixer
6df4954b20
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-12-01 01:41:19 +00:00
Laurent Destailleur
2707c0b89b
Look and feel v13
2020-11-30 20:13:42 +01:00
Laurent Destailleur
de718837e4
Fix warnings
2020-11-30 19:43:43 +01:00
Laurent Destailleur
c0baf483dc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-11-30 18:28:24 +01:00
Laurent Destailleur
3443174f67
Sync transifex
2020-11-30 18:28:04 +01:00
Laurent Destailleur
6f0d49d68d
Merge pull request #15578 from Tim-Otte/fix-product-supplier-price-extrafield
...
FIX for product supplier price extrafields
2020-11-30 15:44:04 +01:00
Laurent Destailleur
958893228a
Fix combo to add contact and status of contact on popup
2020-11-30 15:18:58 +01:00
Laurent Destailleur
00ad6df395
Fight against $_POST
2020-11-30 14:47:07 +01:00
Laurent Destailleur
bd5dc6399b
Fix deprecated code
2020-11-30 12:35:05 +01:00
Laurent Destailleur
4f2259ea38
Fix warning
2020-11-30 12:03:04 +01:00
Tim Otte
16b69a069e
Fixed sql error where column names were used instead of sql column names
2020-11-30 10:21:10 +01:00
Laurent Destailleur
150dd71774
Look and feel v13
2020-11-29 16:02:39 +01:00
Laurent Destailleur
404634919d
Look and feel v13
2020-11-29 15:47:08 +01:00
Laurent Destailleur
6c65ebef0d
Look and feel v13
2020-11-29 15:16:53 +01:00
Laurent Destailleur
fab9b3d50c
Fix warning
2020-11-28 18:34:13 +01:00
andreubisquerra
c9c2869eec
Fix travis
2020-11-27 19:45:40 +01:00
andreubisquerra
c3bc662675
Improve free entries printing in TakePOS
...
Improve free entries printing with Receipt Printer module in TakePOS
2020-11-27 19:24:27 +01:00
Laurent Destailleur
574919de52
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/accountancy/bookkeeping/balance.php
htdocs/adherents/class/subscription.class.php
htdocs/compta/bank/categ.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/class/interfaces.class.php
htdocs/core/lib/project.lib.php
htdocs/core/modules/modCategorie.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/install/repair.php
htdocs/main.inc.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
htdocs/reception/card.php
2020-11-27 15:45:12 +01:00
Laurent Destailleur
4a5cdd0092
Several fixes in export and repair tool
2020-11-27 15:27:35 +01:00
Laurent Destailleur
ac3c129735
Clean code
2020-11-27 14:24:15 +01:00
Frédéric FRANCE
1704de39bb
Merge remote-tracking branch 'upstream/develop' into patch-10
2020-11-27 11:18:04 +01:00
Laurent Destailleur
47a5037155
Fix dolGetFirstLastname() for 4 and 5
2020-11-27 01:18:01 +01:00
Laurent Destailleur
97f6efb079
Fix avoid to trigger sql injection detection
2020-11-26 23:50:00 +01:00
Laurent Destailleur
b3b511a6d4
FIX #15546
2020-11-26 22:44:11 +01:00
Laurent Destailleur
5d9098795f
Fix labels in combo
2020-11-26 19:17:09 +01:00
Laurent Destailleur
084b2411df
Merge pull request #15550 from OPEN-DSI/new-supplier-product-list-with-stock
...
NEW show stock in supplier product select list
2020-11-26 18:56:04 +01:00
Laurent Destailleur
82da0d01f1
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formorder.class.php
htdocs/fourn/commande/list.php
2020-11-26 18:52:00 +01:00
Laurent Destailleur
b043442b91
Fix link and selection of status of purchase order.
2020-11-26 17:53:57 +01:00
Laurent Destailleur
3588781180
Debug v13
2020-11-26 14:15:20 +01:00
lvessiller
17e13eb821
NEW show stock in supplier product select list
2020-11-26 14:12:02 +01:00
Laurent Destailleur
e272130a6a
Fix phpcs
2020-11-26 08:40:08 +01:00
Laurent Destailleur
74605cec12
Fix warning
2020-11-25 18:07:52 +01:00
Laurent Destailleur
4d90fb22de
Fix sql syntax error
2020-11-25 15:07:26 +01:00
Laurent Destailleur
5030f0c587
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/opensurvey/wizard/create_survey.php
2020-11-25 14:55:31 +01:00
Laurent Destailleur
bf7b6ee00d
Fix delete of proposal
2020-11-25 14:15:59 +01:00
Frédéric FRANCE
c09a6d1435
Merge remote-tracking branch 'upstream/develop' into patch-10
2020-11-25 12:59:32 +01:00
Frédéric FRANCE
0d24fc56b9
doxygen
2020-11-24 22:40:41 +01:00
Frédéric FRANCE
66ad0e5b13
add note on ecm files
2020-11-24 18:54:59 +01:00
Laurent Destailleur
81566289cd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
2020-11-24 11:07:35 +01:00
Laurent Destailleur
bc1d286673
Merge pull request #15495 from Givriz/dev
...
Feature : creation of a "button-cancel" class
2020-11-23 21:53:45 +01:00
Laurent Destailleur
5822fcfbed
FIX several warning with the barcode use in ODT templates
2020-11-23 21:38:45 +01:00
Laurent Destailleur
efc539c4b4
Fix css
2020-11-23 19:53:58 +01:00
Givriz
dca4cf5987
Feature : ajout de la class "button-cancel"
...
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
2020-11-23 15:12:52 +01:00
Laurent Destailleur
2f6f242d99
CSS
2020-11-23 12:29:38 +01:00
Laurent Destailleur
7d1b84d482
Fix warning
2020-11-22 22:58:14 +01:00
Laurent Destailleur
af2eabb24d
Fix warning
2020-11-22 15:06:53 +01:00
Laurent Destailleur
f6d6efa288
CSS
2020-11-22 13:23:56 +01:00
Laurent Destailleur
986f918436
Fix image edition when gravatar module is on
2020-11-22 01:47:17 +01:00
Laurent Destailleur
a30e842521
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-11-21 23:48:34 +01:00
Laurent Destailleur
60bfbe2e57
Merge pull request #15448 from Givriz/dev
...
Feature : creation of a "button-save" class
2020-11-21 23:44:30 +01:00
Laurent Destailleur
782e3b4c23
Merge pull request #15458 from frederic34/patch-23
...
doxygen
2020-11-21 23:42:56 +01:00
Laurent Destailleur
9004be1df2
Debug feature to send remind by email
2020-11-21 17:42:07 +01:00
Laurent Destailleur
3534555909
Fix setup of scheduled jobs
2020-11-21 14:14:53 +01:00
Damien BENOIT
ebd64d5e57
Merge pull request #5 from Dolibarr/develop
...
Update fork
2020-11-20 13:53:43 +01:00
Laurent Destailleur
07c192efb8
Merge pull request #15457 from frederic34/patch-22
...
Update ldap.class.php
2020-11-20 13:37:24 +01:00
Frédéric FRANCE
b4a5134a7f
doxygen
2020-11-19 22:25:02 +01:00
Frédéric FRANCE
5d4d7c99d6
Update ldap.class.php
...
The variable $result seems to be never defined.
2020-11-19 22:07:32 +01:00
Frédéric FRANCE
efa5c89c45
Update rssparser.class.php
...
The variable $**** does not seem to be defined for all execution paths leading up to this point.
2020-11-19 22:03:13 +01:00
Givriz
c48129e279
Ajout de la class "button-save"
...
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
2020-11-19 20:23:38 +01:00
Florian HENRY
46326d7659
merge from develop
2020-11-19 13:53:34 +01:00
Laurent Destailleur
83eaf16a22
Fix css
2020-11-18 16:23:08 +01:00
Laurent Destailleur
e78b9a421d
Fix sql
2020-11-18 13:14:29 +01:00
Laurent Destailleur
17f35e16b9
Merge pull request #15436 from OPEN-DSI/add_extended_infos_on_select_contacts
...
NEW: Add new option for displaying Contact email (or phones if not defined) and town info list (select list or combobox)
2020-11-18 13:12:03 +01:00
Laurent Destailleur
ce173d7b39
Merge pull request #15424 from Tim-Otte/fix-15423
...
Fix for #15423
2020-11-18 12:46:41 +01:00
Laurent Destailleur
a5a7197506
Update extrafields.class.php
2020-11-18 12:45:37 +01:00
Laurent Destailleur
166bb5cc75
Merge pull request #15421 from frederic34/patch-8
...
fix dir for member photo in odt tag
2020-11-18 12:37:03 +01:00
Laurent Destailleur
889a5d0be1
Update commondocgenerator.class.php
2020-11-18 12:04:41 +01:00
kamel
73b35f334e
NEW: Add new option for displaying Contact email (or phones if not defined) and town info list (select list or combobox)
...
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
2020-11-18 09:41:42 +01:00
Laurent Destailleur
17f78f9cec
FIX Protection to avoid duplicate submit when creating a payment.
2020-11-17 18:39:34 +01:00
Laurent Destailleur
6bbeb6d3a0
Fix debug creation of shipment with virtual product.
2020-11-16 16:31:05 +01:00
Laurent Destailleur
ac5fa6c6df
Clean code
2020-11-16 12:54:16 +01:00
Laurent Destailleur
65144f4d5a
fix warning
2020-11-16 11:37:28 +01:00
Tim Otte
4a1f61d759
Fix for #15423
2020-11-16 11:12:43 +01:00
Frédéric FRANCE
8cff0222cd
Update commondocgenerator.class.php
2020-11-15 23:58:35 +01:00
Frédéric FRANCE
35653bb855
fix dir for member photo in odt tag
2020-11-15 23:45:13 +01:00
Laurent Destailleur
89a77fad2c
Fix warning
2020-11-15 16:56:30 +01:00
Laurent Destailleur
2e0e42e918
Fix warning
2020-11-15 14:37:21 +01:00
Frédéric FRANCE
0a5e041775
Merge remote-tracking branch 'upstream/develop' into odtformembers
2020-11-14 00:56:21 +01:00
Laurent Destailleur
7da2d6cda2
Merge pull request #15391 from frederic34/patch-8
...
doxygen
2020-11-14 00:48:52 +01:00
Frédéric FRANCE
4ca3c0aa95
Add odt for members
2020-11-14 00:48:13 +01:00
Laurent Destailleur
3c5ef18b36
FIX #15390
2020-11-14 00:47:28 +01:00
Frédéric FRANCE
42ddf7e27b
doxygen
2020-11-13 20:45:03 +01:00
Laurent Destailleur
5498800ad6
Update commonobject.class.php
2020-11-13 10:02:34 +01:00
Günter Lukas
2da8fb75a8
Fix #15371
...
Extrafields from type "select" depending on other fields not working in Safari & jquery select2 #15371
2020-11-12 15:59:42 +01:00
Laurent Destailleur
1dbc91e343
Clean code
2020-11-12 13:44:57 +01:00
Laurent Destailleur
767f07d02e
Debug function to show list of files in ECM module
2020-11-11 22:47:06 +01:00
Laurent Destailleur
03e60bf084
Fix warning
2020-11-11 20:27:21 +01:00
Laurent Destailleur
90884d8085
Fix compatibility with date_delivery
2020-11-11 18:08:40 +01:00
Florian Mortgat
952f398a60
Apply stickler CI recommendation to avoid concatenating string literals
2020-11-10 23:50:42 +01:00
Laurent Destailleur
db08786ddf
Add missing properties
2020-11-10 20:13:54 +01:00
Florian Mortgat
a64c4b0cb5
support for $moreparam
2020-11-10 17:29:03 +01:00
Florian Mortgat
2c1d4049be
Enable list filtering on date and datetime extrafields
2020-11-10 17:24:17 +01:00
Laurent Destailleur
29f0a9b784
Fix in select of user when firstname and lastname is empty
2020-11-10 15:03:35 +01:00
Laurent Destailleur
f8ddad4d4c
Fix warning
2020-11-10 13:20:45 +01:00
Alexandre SPANGARO
82d1f99010
Merge remote-tracking branch 'upstream/develop' into 14a2
2020-11-10 04:09:00 +01:00
Bahfir Abbes
f4566fe0f1
fix:link name
2020-11-09 22:20:20 +01:00
Scrutinizer Auto-Fixer
f6e3f58fcb
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-11-09 14:18:56 +00:00
Laurent Destailleur
0f90cee597
Fix missing fields
2020-11-09 15:15:21 +01:00
Laurent Destailleur
5be634cbd4
Clean code
2020-11-09 11:34:58 +01:00
Laurent Destailleur
807d3b99c9
Fix update field when visilbity is 4 or -4
2020-11-09 09:53:56 +01:00
Laurent Destailleur
310123fe33
Merge pull request #15331 from Ahuahuachi/develop
...
NEW Allow disable multiple file upload in form_attach_new_file method
2020-11-08 12:38:29 +01:00
Laurent Destailleur
e103503bb1
Fix warning php8
2020-11-08 12:34:45 +01:00
Alfredo Altamirano
f57c6dd25e
Add $disablemulti option to form_attach_new_file method
...
This new option allows to disable multiple file upload for use on specific upload forms
2020-11-07 18:03:55 -06:00
Laurent Destailleur
9d3a25e2a3
Doxygen
2020-11-08 00:35:10 +01:00
Florian HENRY
312438d62a
Merge branch 'dev_multifilter_jounal_on_bookeping' of github.com:FHenry/dolibarr into dev_multifilter_jounal_on_bookeping
2020-11-07 15:48:39 +01:00
Florian HENRY
58cb63adf7
fix stockler
2020-11-07 15:48:12 +01:00
stickler-ci
259462b53a
Fixing style errors.
2020-11-07 14:36:28 +00:00
Florian HENRY
1bdd617feb
NEW: Multiselect ledger account code filter on book keeping list
2020-11-07 15:31:27 +01:00
Laurent Destailleur
c071dd254b
Fix warning
2020-11-07 14:35:28 +01:00
Laurent Destailleur
a72107ce06
Fix regression
2020-11-07 14:33:21 +01:00
Laurent Destailleur
2fdba3ad46
Fix warning
2020-11-07 12:53:52 +01:00
Laurent Destailleur
2da6fc1ef0
Remove warning
2020-11-07 12:06:14 +01:00
Laurent Destailleur
fe8d93f72d
Fix phpcs
2020-11-07 01:17:54 +01:00
Laurent Destailleur
c097e140cc
Fix php8
2020-11-06 15:41:34 +01:00
Laurent Destailleur
ac6f8e4e7c
Debug v13
2020-11-06 11:52:48 +01:00
bahfir abbes
11099132da
New: add notification on ACTION_CREATE event
2020-11-06 00:48:23 +01:00
Alexandre SPANGARO
61bca50fa6
NEW: Dictionary for availability - Add column position
2020-11-05 16:56:28 +01:00
Laurent Destailleur
1d9aacc7da
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/commoninvoice.class.php
htdocs/core/modules/import/import_csv.modules.php
htdocs/core/modules/import/import_xlsx.modules.php
2020-11-05 09:51:28 +01:00
Laurent Destailleur
824b778d51
Update commonobject.class.php
2020-11-05 09:07:06 +01:00
Francis Appels
5866facf11
Update commonobject.
...
Don't think $fk_delivery_address is deprecated, also no alternative indicated.
Switch of implode paramenters.
showInputField preselected value for array type can be array.
2020-11-04 20:31:55 +01:00
jcp
1f483d7c28
Fix force payment mode to create withdrawal
2020-11-04 11:43:03 +01:00
Laurent Destailleur
b0e2d40533
Debug and fix v13
2020-11-03 14:19:54 +01:00
Laurent Destailleur
5f290e0de1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-11-02 11:41:19 +01:00
Laurent Destailleur
83a7b19333
Look and feel v13
2020-11-02 11:41:07 +01:00
Laurent Destailleur
ea3106cd07
Merge pull request #15252 from frederic34/specimencommon
...
initSpecimenCommon
2020-11-02 09:29:48 +01:00
Laurent Destailleur
878b8f25de
Update commonobject.class.php
2020-11-02 09:29:26 +01:00
Frédéric FRANCE
a1016d79a2
initSpecimenCommon
2020-11-01 20:33:06 +01:00
Laurent Destailleur
ce7a96cbf1
Add more assertion
2020-11-01 20:11:09 +01:00
Laurent Destailleur
e0ed89c514
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/compta/facture/card.php
htdocs/contrat/class/contrat.class.php
htdocs/core/actions_addupdatedelete.inc.php
htdocs/product/class/product.class.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
2020-11-01 17:58:41 +01:00
Laurent Destailleur
63a03cdad6
FIX #15208
2020-11-01 14:34:29 +01:00
Laurent Destailleur
4feed10b75
Merge pull request #15246 from hregis/develop_bug2
...
FIX to avoid error with geoip
2020-11-01 13:54:58 +01:00
Regis Houssin
e19e56e14c
FIX to avoid error with geoip
2020-11-01 10:47:54 +01:00
Frédéric FRANCE
d9bf49c5dc
phpcs
2020-10-31 21:04:38 +01:00
Scrutinizer Auto-Fixer
ab25e047c0
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 17:51:30 +00:00
Laurent Destailleur
125b94d749
Merge pull request #15234 from frederic34/patch-8
...
doxygen
2020-10-31 15:05:41 +01:00
stickler-ci
284c9bc6a8
Fixing style errors.
2020-10-31 13:34:01 +00:00
Scrutinizer Auto-Fixer
7f52920716
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Frédéric FRANCE
78b94c775b
Update commonobject.class.php
2020-10-31 13:59:46 +01:00
Laurent Destailleur
11f9c4cfbd
Merge pull request #15117 from atm-jpb/develop_editorRate
...
# New multi-currency exchange rate editor
2020-10-31 13:55:42 +01:00
Laurent Destailleur
1af3709793
Merge pull request #15232 from frederic34/patch-6
...
doxygen
2020-10-31 13:50:28 +01:00
Laurent Destailleur
2b09b7be8e
Fix css
2020-10-31 13:47:50 +01:00
Frédéric FRANCE
85b3b5de36
Update commonobject.class.php
2020-10-31 13:24:09 +01:00
Laurent Destailleur
cea61d3b52
Fix var
2020-10-31 12:44:14 +01:00
Laurent Destailleur
a24071492e
Start fix for php8 compatibility
2020-10-30 05:56:07 +01:00
Laurent Destailleur
b3333da5c1
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/security2.lib.php
htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
htdocs/main.inc.php
2020-10-30 04:39:41 +01:00
Laurent Destailleur
840ca73464
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/class/hookmanager.class.php
htdocs/main.inc.php
htdocs/theme/eldy/info-box.inc.php
htdocs/theme/eldy/style.css.php
2020-10-30 04:21:07 +01:00
Laurent Destailleur
f5a156ee06
Fix regression
2020-10-30 04:17:02 +01:00
Laurent Destailleur
1b5bcaccc6
Fix remove warnings
2020-10-30 04:13:31 +01:00
Laurent Destailleur
ec0c8e0c79
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/lib/security2.lib.php
htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
htdocs/core/tpl/advtarget.tpl.php
2020-10-30 03:35:40 +01:00
Laurent Destailleur
263b679af4
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/tpl/advtarget.tpl.php
2020-10-30 03:31:04 +01:00
Laurent Destailleur
8c646cdf4f
Merge pull request #15207 from frederic34/patch-11
...
Mutualise code, introduce MAIN_ALL_TOWN_TO_UPPER
2020-10-29 17:49:16 +01:00
Regis Houssin
032813fa19
FIX extrafield date not recover in create/edit mode
2020-10-29 11:05:45 +01:00
Frédéric FRANCE
4d716e74bd
Mutualise code, introduce MAIN_ALL_TOWN_TO_UPPER
2020-10-28 19:06:45 +01:00
Scrutinizer Auto-Fixer
208740c9c4
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-28 16:49:52 +00:00
Laurent Destailleur
f760b20bde
Fix double semi colon
2020-10-28 17:48:20 +01:00
Florian Mortgat
a4af2e94a9
FIX 10.0 - make formConfirm an addreplace-type hook
2020-10-28 17:08:09 +01:00
Marc de Lima Lucio
ca2ed2ef74
NEW: ref in product customer price: look for products with customer ref
2020-10-28 11:04:15 +01:00
Florian HENRY
a3073be8e4
Merge github.com:Dolibarr/dolibarr into dev_new_add_desc_when_select_product
2020-10-28 08:52:29 +01:00
Scrutinizer Auto-Fixer
a2a9c51e50
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-27 18:46:07 +00:00
Laurent Destailleur
1b939ab8f4
Merge pull request #15183 from frederic34/dol_fiche_end
...
end of dol_fiche_end
2020-10-27 19:00:32 +01:00
Laurent Destailleur
e099507594
Fix regression
2020-10-27 18:53:03 +01:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end
2020-10-27 18:19:31 +01:00
Laurent Destailleur
fe357e17e8
Fix for ja
2020-10-27 11:00:50 +01:00
Florian HENRY
2c772cd8bb
try to make it work for experimental PRODUIT_CUSTOMER_PRICES_BY_QTY option
2020-10-27 09:52:04 +01:00
Laurent Destailleur
efce53abd1
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/boxes/box_services_contracts.php
htdocs/expensereport/class/expensereport.class.php
2020-10-26 18:17:23 +01:00
Laurent Destailleur
2c2142ddba
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-10-26 18:13:47 +01:00
Laurent Destailleur
adeddc70ca
FIX Deletion of expensereport + other generated object not complete.
2020-10-26 18:10:58 +01:00
Florian HENRY
76824c868b
clean get price for fourn and labal for supplier coducment
2020-10-26 16:31:07 +01:00
Laurent Destailleur
2638d4596a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/actions_sendmails.inc.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/facture/card.php
2020-10-25 21:33:13 +01:00
Laurent Destailleur
cd4d738a56
Merge branch 'translateModLivraison2ModDelivery' of
...
https://github.com/orebd/dolibarr into develop
# Conflicts:
# htdocs/install/mysql/migration/12.0.0-13.0.0.sql
2020-10-25 16:01:18 +01:00
Laurent Destailleur
6fa174d13f
Merge pull request #15051 from laudeco/feature/11878_select_bank_account
...
11878 - select the only bank account
2020-10-25 14:56:08 +01:00
Laurent Destailleur
dbf626b92b
Update html.form.class.php
2020-10-25 14:55:52 +01:00
Laurent Destailleur
e7743948cb
Merge pull request #15120 from frederic34/patch-6
...
Update commonobject.class.php
2020-10-25 14:50:56 +01:00
Laurent Destailleur
4d9c8e2225
Merge pull request #15124 from frederic34/retrieve
...
retrieve the spelling
2020-10-25 14:48:51 +01:00
Laurent Destailleur
c6cee2f96f
Merge pull request #15128 from frederic34/patch-11
...
doxygen
2020-10-25 14:34:15 +01:00
Laurent Destailleur
bb147d2599
FIX #15140
2020-10-25 14:12:34 +01:00
Maxime Kohlhaas
bedfb7ac8d
Fix BOM position field
2020-10-24 19:19:06 +02:00
Laurent De Coninck
1d62834b2c
use the second version for default bank account
2020-10-24 17:15:48 +02:00
Frédéric FRANCE
3d3b530357
doxygen
2020-10-23 22:24:20 +02:00
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉
2020-10-23 20:08:35 +02:00
Frédéric FRANCE
c3863aeed8
Update commonobject.class.php
2020-10-23 18:18:01 +02:00
Laurent Destailleur
50da1cd95e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-10-23 17:33:57 +02:00
Laurent Destailleur
cf4ea4168d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/extrafields.class.php
2020-10-23 17:33:14 +02:00
Laurent Destailleur
f00fa93903
FIX check on required field when updating 1 extrafields.
2020-10-23 17:31:17 +02:00
Laurent Destailleur
377c44eeab
Merge pull request #14656 from OPEN-DSI/v10-fix-extrafields-select-required
...
FIX no empty value in required extrafield
2020-10-23 17:29:12 +02:00
Laurent Destailleur
572637b726
Enhance update of 1 extrafield (simple update instead of delete+insert)
2020-10-23 15:31:13 +02:00
jpb
47351c3cb3
Fix : stickler-ci
2020-10-23 13:55:55 +02:00
jpb
63c82b47fe
Merge branch '11.0_currencyRateEditor' of github.com:atm-jpb/dolibarr into develop_editorRate
2020-10-23 12:27:14 +02:00
jpb
1ecff0a608
add list and crud
2020-10-23 11:58:25 +02:00
Laurent Destailleur
81543df5e4
Fix warnings
2020-10-23 04:24:54 +02:00
Laurent Destailleur
0a1e49447d
Merge pull request #15108 from frederic34/patch-4
...
Update cproductnature.class.php
2020-10-23 04:07:03 +02:00
stickler-ci
5638a49774
Fixing style errors.
2020-10-22 22:23:03 +00:00
Frédéric FRANCE
43bb812260
Update cproductnature.class.php
2020-10-23 00:22:34 +02:00
Frédéric FRANCE
9a470fa42d
replace deprecated
2020-10-22 22:50:03 +02:00
Frédéric FRANCE
ed8bfa26fb
Update cproductnature.class.php
2020-10-22 22:20:48 +02:00
Laurent Destailleur
fb7202b7f8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-10-22 17:55:47 +02:00
Laurent Destailleur
0616b9bc9b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/card.php
htdocs/compta/prelevement/line.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/functions2.lib.php
htdocs/core/tpl/card_presend.tpl.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
2020-10-22 17:55:38 +02:00
Laurent Destailleur
a17c391efe
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
htdocs/product/composition/card.php
2020-10-22 17:38:48 +02:00
Laurent Destailleur
cfcac7e053
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/lib/functions2.lib.php
2020-10-22 17:34:48 +02:00
Laurent Destailleur
9c9d468a18
Merge pull request #15052 from andreubisquerra/master
...
TakePOS connector compatibility with templates
2020-10-22 16:11:16 +02:00
Florian HENRY
d4fd71d0b3
fix #14649
2020-10-20 19:58:11 +02:00
Laurent Destailleur
ef182bed07
Fix browser reminder
2020-10-18 14:00:47 +02:00
jove@bisquerra.com
1283c6e095
TakePOS connector compatibility with templates
2020-10-18 09:29:33 +02:00
Laurent De Coninck
d2e2cad028
select by default, remove the show empty everywhere the field is required
2020-10-17 21:15:52 +02:00
Laurent Destailleur
547b3602cc
FIX refresh of tasks combo must use an ajax page not a full html page
2020-10-17 21:14:19 +02:00
Laurent De Coninck
cea7fd6894
select the only bank account
...
When there is only one bank account in the dropdown of the bank account,
select it by default.
[see: #11878 ]
2020-10-17 20:45:37 +02:00
Laurent Destailleur
f2fafe04b6
Update doc
2020-10-17 18:16:03 +02:00
Laurent Destailleur
7b20e703ee
Clean code
2020-10-17 15:53:31 +02:00
Laurent Destailleur
20b6d3828e
NEW Show image of user in the combo select of users
2020-10-17 13:27:39 +02:00
Laurent Destailleur
5df1218d9f
Enhance page to setup email templates
2020-10-17 12:59:22 +02:00
Laurent Destailleur
e3552e7e02
Clean code
2020-10-16 20:17:54 +02:00
Laurent Destailleur
67785887fd
Merge pull request #15035 from andreubisquerra/master
...
Change the tag char for security reasons in 'Receipt Printer' module
2020-10-16 17:20:04 +02:00
Laurent Destailleur
e74b833d7f
Look and feel v13
2020-10-16 15:40:52 +02:00
Laurent Destailleur
7504f92a41
Standardize code and look and feel
2020-10-16 13:30:20 +02:00
Laurent Destailleur
5905d3be64
Fix phpcs
2020-10-16 00:06:26 +02:00
jove@bisquerra.com
f90b236e0f
Change the tag char for security reasons in 'Receipt Printer' module
2020-10-15 23:44:13 +02:00
Laurent Destailleur
64b1a31e45
Merge pull request #15018 from FHenry/dev_add_dict_NatureOfProductType
...
NEW : Nature of product is now a dictionay
2020-10-15 21:07:42 +02:00
Laurent Destailleur
9bbb471b4f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/stats/cabyprodserv.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/loan/card.php
2020-10-15 20:51:30 +02:00
Laurent Destailleur
5b37ff0bfd
Html entities use now HTML5. Enhance the Dolibarr WAF. More PHPUnit
...
tests.
2020-10-15 19:36:08 +02:00
Laurent Destailleur
844c4dec4d
css
2020-10-15 13:16:17 +02:00
stickler-ci
05ac7c91c7
Fixing style errors.
2020-10-14 16:25:23 +00:00
Florian HENRY
4fd32325d6
cast int
2020-10-14 18:22:55 +02:00
Florian HENRY
bcb98d1d67
Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType
2020-10-14 18:16:34 +02:00
Laurent Destailleur
c079076488
Merge pull request #15010 from bafbes/abb120147
...
fix:allow const files loading from modules inside custom folders
2020-10-14 17:39:08 +02:00
Florian HENRY
fd1fa1c777
Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType
2020-10-14 16:39:54 +02:00
Florian HENRY
7d09f22afa
add correct import and dict edition
2020-10-14 16:39:42 +02:00
Florian HENRY
a2ef7bc61e
add select
2020-10-14 14:26:40 +02:00
Laurent Destailleur
a0b17635fd
NEW When creating a user from a member linked to a thirdparty, you can
...
decide if it is an internal or external (default) user.
2020-10-14 14:02:07 +02:00
Laurent Destailleur
7838ca32ba
Fix sql injection reported by Jason Nordenstam
2020-10-14 01:52:53 +02:00
bahfir abbes
4ee6cedbe6
Option d’Activation du fichier global de configuration.
2020-10-13 23:33:25 +01:00
Laurent Destailleur
d3b6ada4eb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/compta/stats/cabyprodserv.php
2020-10-13 15:08:53 +02:00
Laurent Destailleur
bc6b5d919a
Better responsive
2020-10-13 10:51:51 +02:00
Laurent Destailleur
7c67dbf6d5
Better responsive
2020-10-13 10:05:47 +02:00
Laurent Destailleur
66a6415230
Merge pull request #14994 from grandoc/new_branch_12_10_2020
...
fix : undefined index
2020-10-12 19:37:37 +02:00
Laurent Destailleur
fcd4645509
Standardize code: Property product_libelle renamed into product_label
...
Move common vars declaration into parent class.
2020-10-12 19:33:00 +02:00
Philippe GRAND
4da75c4251
fix : undefined index
2020-10-12 16:11:56 +02:00
Laurent Destailleur
726fd1b631
Merge pull request #11227 from aspangaro/10.0_intracommreport
...
NEW module Intracomm report
2020-10-12 13:35:58 +02:00
Laurent Destailleur
29f19d9550
Merge pull request #14964 from TobiasSekan/MoreFilterOnLeaveLog
...
NEW More filter for "View change logs"
2020-10-10 15:35:55 +02:00
Alexandre SPANGARO
8876457b54
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-10-10 06:47:05 +02:00
Alexandre SPANGARO
4dcd2bfcda
Fix Travis
2020-10-09 13:58:35 +02:00
Laurent Destailleur
1239152368
Update dolgraph.class.php
2020-10-09 13:54:47 +02:00
Regis Houssin
b591e6510b
FIX avoid warning "Parameter must be an array"
2020-10-09 11:03:44 +02:00
Alexandre SPANGARO
b3b37dd9ee
Fix sticklerCI
2020-10-09 09:32:50 +02:00
Alexandre SPANGARO
ca7ad35342
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-10-09 06:39:42 +02:00
Laurent Destailleur
e7c456f6f2
NEW Add column payment term into list of supplier invoices.
2020-10-08 19:22:21 +02:00
Laurent Destailleur
047d6f78e7
Fix status disabled of task intocombo list
2020-10-08 17:49:26 +02:00
Aurélien
b6283c1a5d
Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery
2020-10-08 16:19:10 +02:00
Sekan, Tobias
7e3a3a4cf3
Add more filter for leave log view
2020-10-08 10:30:09 +02:00
Laurent Destailleur
eb41a72e27
Properties ->titre have been renamed into ->title
2020-10-07 17:41:36 +02:00
Laurent Destailleur
c7ca99accb
Fix default value of enabled property of menu entry
2020-10-07 15:38:07 +02:00
Scrutinizer Auto-Fixer
1512521d91
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-07 13:01:28 +00:00
Laurent Destailleur
84105e996a
Fix for #14940
2020-10-07 01:03:48 +02:00
Laurent Destailleur
ea8ec4ea90
Clean code
2020-10-07 00:59:05 +02:00
Laurent Destailleur
77788a0591
Clean code
2020-10-07 00:26:03 +02:00
Laurent Destailleur
2c5d396546
Fix upload file
2020-10-06 17:45:08 +02:00
Laurent Destailleur
663f149982
Better error management
2020-10-06 16:48:48 +02:00
AurelienBinard
39d538befc
Merge branch 'develop' into translateModLivraison2ModDelivery
2020-10-06 16:20:25 +02:00
Aurélien
f954e8b173
:mod livraison rename user acces right #14697
2020-10-06 16:10:48 +02:00
Aurélien
c8cd55e158
debug access right after rename class #14697
2020-10-06 15:57:50 +02:00
Aurélien
1af42b313c
rename livraison pdf and dependencies #14697
2020-10-06 13:32:02 +02:00
Aurélien
af7c23b2ac
rename folder admin/livraison.php and dependencies #14697
2020-10-06 12:05:24 +02:00
lvessiller
496150d747
FIX extrafield required error after submit
2020-10-06 10:21:24 +02:00
Laurent Destailleur
e5cdffcdec
Merge pull request #14922 from andreubisquerra/develop
...
TakePOS connector compatibility with RECEIPT PRINTERS module
2020-10-05 16:38:56 +02:00
Laurent Destailleur
cfc3c01815
Factorize code to know if a parameter is used to store a secret
2020-10-05 12:13:06 +02:00
Laurent Destailleur
62177edab1
NEW Can force the antivirus from conf file or autoprepend ini setup.
2020-10-05 05:00:59 +02:00
Laurent Destailleur
800c0d2b00
Fix method must return a string not print on output
2020-10-05 02:24:45 +02:00
andreubisquerra
65c6881fc9
NEW: TakePOS connector compatibility with RECEIPT PRINTERS module
2020-10-04 22:49:47 +02:00
Laurent Destailleur
581a3d8808
FIX Add a better message when file size is too large
2020-10-03 14:02:53 +02:00
Laurent Destailleur
1a535dc77b
Clean code
2020-10-02 19:00:15 +02:00
Laurent Destailleur
bc308fc662
Look and feel v13 - Disabled users are greyed
2020-10-02 14:19:44 +02:00
Laurent Destailleur
3c6fcced8e
Clean code
2020-10-02 13:38:35 +02:00
Laurent Destailleur
86c9c28e7c
Merge pull request #14895 from hregis/12.0_ldap
...
FIX missing hook 'formConfirm' in 'addreplace' $hooktype
2020-10-02 13:33:35 +02:00
Regis Houssin
f67189aaa8
FIX missing hook 'formConfirm' in 'addreplace' $hooktype
2020-10-02 13:16:42 +02:00
Laurent Destailleur
ce0fa53cb0
Fix delete of file from file manager
2020-10-02 03:07:31 +02:00
Laurent Destailleur
ece8037f42
The button "Invoice orders" switch to page with lines autoselected.
2020-10-01 18:08:46 +02:00
Laurent Destailleur
7b3a7c9921
Add token on all url with action=delete
2020-10-01 10:50:54 +02:00
Laurent Destailleur
1e176fad8f
Fix GETPOST on array
2020-09-29 21:28:07 +02:00
Laurent Destailleur
879d041398
Can force the typeof check of GETPOST into $fields for type text.
2020-09-29 20:48:40 +02:00
Laurent Destailleur
8b2ba8cbba
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/bom/bom_card.php
htdocs/core/class/ldap.class.php
htdocs/core/lib/files.lib.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/admin.lang
2020-09-29 13:28:22 +02:00
Laurent Destailleur
43c167f0c8
Fix init var
2020-09-28 20:47:36 +02:00
Laurent Destailleur
8e59d0528e
Update html.formactions.class.php
2020-09-27 18:33:13 +02:00
Florian HENRY
f9d4a4d2ba
Merge branch 'develop' into fix_eventcreation
2020-09-27 17:58:05 +02:00
Laurent Destailleur
c659379307
Try a more complete fix than #14821
2020-09-27 17:21:49 +02:00
Laurent Destailleur
33d578a660
Fix bad management of default value in database on create form
2020-09-26 04:25:06 +02:00
Laurent Destailleur
88b4c1e766
Fix calculation of nb of top menu in CSS files.
2020-09-25 14:09:51 +02:00
Regis Houssin
d38c557fba
FIX Can create user but not update user with activedirectory
2020-09-25 12:11:13 +02:00
Laurent Destailleur
f066da1811
Minor security fixes
2020-09-24 16:19:24 +02:00
Laurent Destailleur
becf91904f
css
2020-09-24 08:55:33 +02:00
Laurent Destailleur
28d25f596b
Merge pull request #14671 from Tim-Otte/feature-add-incoterms-to-odt
...
NEW: Added incoterms to substitution array
2020-09-23 20:10:22 +02:00
Laurent Destailleur
09c6761dae
NEW Include the tag editor of page as a popup into website editor
2020-09-23 16:36:19 +02:00
Laurent Destailleur
6c06d2f0aa
Look and feel v13
2020-09-22 15:26:29 +02:00
Laurent Destailleur
c61e8f052b
NEW Add property cssview when declaring fields of an object
2020-09-22 08:54:40 +02:00
Laurent Destailleur
e52559783f
Look and feel v13
2020-09-21 13:54:26 +02:00
Laurent Destailleur
3ca379c9e6
FIX Restore multiselect (selection of prospect level)
...
Conflicts:
htdocs/core/class/html.form.class.php
2020-09-21 12:22:57 +02:00
Laurent Destailleur
6380a294fc
FIX Restore multiselect (selection of prospect level)
2020-09-21 12:16:22 +02:00
Florian HENRY
0adca0a660
fix event creation same on all page
2020-09-21 11:43:08 +02:00
Tim Otte
05275a2b67
Added check if method exists
2020-09-21 08:50:39 +02:00
Laurent Destailleur
d5e6273b45
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-09-20 18:06:04 +02:00
Laurent Destailleur
acf28e28af
Label
2020-09-20 18:01:17 +02:00
Laurent Destailleur
ab94224d0c
Merge pull request #14668 from OPEN-DSI/email_smtp_allow_auto_signed
...
NEW : Email configuration - Allow auto signed certificat when smtp ssl activated
2020-09-20 17:56:23 +02:00
Laurent Destailleur
cd8ebd9500
Fix warnings
2020-09-20 16:57:53 +02:00
Laurent Destailleur
b3dd51b790
Fix warnings
2020-09-20 16:46:29 +02:00
Laurent Destailleur
667fb1098c
Fix
2020-09-20 16:06:53 +02:00
Laurent Destailleur
1a494542c6
Fix static
2020-09-20 14:40:49 +02:00
Laurent Destailleur
3f2220bd6f
Fix
2020-09-20 14:34:19 +02:00
Laurent Destailleur
216b3c885d
Fix escaping
2020-09-20 01:30:36 +02:00
Laurent Destailleur
54c0f742b1
Fix escape
2020-09-19 21:19:04 +02:00
Laurent Destailleur
99c05f0923
Fix rss
2020-09-19 00:51:09 +02:00
Laurent Destailleur
f62d52f89a
Fix tooltip for linkto object.
...
Fix security of ajax selectobject.php
2020-09-19 00:44:47 +02:00
Laurent Destailleur
b6c6473cce
Fix sql injection when forging requests with IN
2020-09-18 17:47:40 +02:00
Laurent Destailleur
2d38644ae1
Sanitize sortfield
2020-09-18 17:13:01 +02:00
Laurent Destailleur
d75e1e5771
Fix #yogosha4525
2020-09-18 16:10:11 +02:00
Laurent Destailleur
c4b5f5a249
Maxi clean of code
2020-09-18 01:29:17 +02:00
Laurent Destailleur
4630887591
Fix css
2020-09-16 20:09:40 +02:00
Laurent Destailleur
d0c02f3714
FIX #yogosha4426
2020-09-16 14:51:46 +02:00
Laurent Destailleur
ffa91451eb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-09-16 02:50:36 +02:00
Laurent Destailleur
e5191cad24
Move code of incoterm into the Incoterm Trait.
2020-09-16 02:50:18 +02:00
Laurent Destailleur
2da4838141
Merge pull request #14730 from ptibogxiv/patch-358
...
NEW get state dictionnary by REST API
2020-09-16 01:12:08 +02:00
Laurent Destailleur
6dd1f522eb
CSS
2020-09-14 22:30:22 +02:00
Laurent Destailleur
f626bd70d0
Look and feel v13
2020-09-14 20:53:42 +02:00
stickler-ci
75a9678086
Fixing style errors.
2020-09-14 08:48:04 +00:00
ptibogxiv
e98ae029e3
Update cstate.class.php
2020-09-14 10:46:19 +02:00
kkhelifa-opendsi
1f5f784b75
Merge branch 'develop' into email_smtp_allow_auto_signed
2020-09-14 10:25:15 +02:00
kamel
2a5b31da2d
CORE smtps: Corrections
2020-09-14 10:22:05 +02:00
Scrutinizer Auto-Fixer
73915d51c8
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-14 02:30:04 +00:00
Laurent Destailleur
59bc8ee07c
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/stats/byproperties.php
htdocs/adherents/stats/geo.php
htdocs/admin/system/dolibarr.php
htdocs/core/class/commonobjectline.class.php
htdocs/core/tpl/objectline_title.tpl.php
htdocs/langs/en_US/admin.lang
htdocs/product/class/product.class.php
2020-09-14 02:49:19 +02:00
Laurent Destailleur
0d9d9498e2
Update commonobjectline.class.php
2020-09-14 00:13:12 +02:00
DEMAREST Maxime (Indelog)
1c523abbd8
Fix: getLabelOfUnit() for Product, CommonObjectline to print long label
...
Also add $type = 'code' for return unit code in form 'unitXX' (where XX
is the code of unit).
for get return like unitXX where XX is the code of unit
2020-09-13 07:44:30 +02:00
Cédric
acc995a553
Update commoninvoice.class.php
2020-09-12 19:05:33 +02:00
Laurent Destailleur
1f8278c8ca
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/core/class/html.formmail.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/langs/en_US/other.lang
htdocs/product/class/product.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-09-12 04:42:59 +02:00
Laurent Destailleur
5ea3f09e17
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/class/translate.class.php
2020-09-12 04:29:28 +02:00
Laurent Destailleur
709542e27d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-09-12 04:26:00 +02:00
Laurent Destailleur
990af9d5cf
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formmail.class.php
2020-09-12 04:25:54 +02:00
bahfir abbes
e89bfe5ac1
fix: unuseful truncations in extrafield select lists
2020-09-11 22:44:08 +01:00
Laurent Destailleur
009c7eaf31
Standardize code with module builder
2020-09-11 16:16:04 +02:00
Laurent Destailleur
8d93b76258
Clean code
2020-09-10 17:49:05 +02:00
John Botella
59d5391c2a
Add force reload param to load method
2020-09-10 10:41:16 +02:00
Laurent Destailleur
08ab4855f2
Merge branch 'develop' into 13a11
2020-09-09 19:12:08 +02:00
Laurent Destailleur
12fba9e679
Fix label
2020-09-09 15:19:12 +02:00
Laurent Destailleur
1c8e02df3b
Doc
2020-09-09 15:16:03 +02:00
Laurent Destailleur
230b6cdfd4
Add method isLoaded($domain)
2020-09-09 15:14:52 +02:00
Scrutinizer Auto-Fixer
c263c8a76c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-08 19:27:28 +00:00
John Botella
5a0622c906
FIX cron load lang
2020-09-08 16:14:14 +02:00
Tim Otte
c68928b8d0
Added incoterms to substitution array
2020-09-08 15:53:47 +02:00
lvessiller
23accef5c2
FIX empty value is needed on filter list
2020-09-08 14:53:40 +02:00
kamel
ed13a9fce2
Correction stickler-ci
2020-09-08 14:53:22 +02:00
kamel
ccff18e2a5
NEW : Email configuration - Allow auto signed certificat when ssl activated
2020-09-08 14:48:50 +02:00
Laurent Destailleur
54c0f673c1
Debug hidden option MAIN_USE_EXPENSE_IK
2020-09-08 12:00:14 +02:00
Laurent Destailleur
86ed4dfa2b
Debug hidden option MAIN_USE_EXPENSE_IK
2020-09-08 11:51:36 +02:00
Alexandre SPANGARO
9165ea9e67
Merge remote-tracking branch 'upstream/develop' into 13a11
2020-09-08 08:35:42 +02:00
Laurent Destailleur
fab24e8c55
Fix phpcs
2020-09-08 05:12:08 +02:00
Alexandre SPANGARO
d1ba6b9476
Merge remote-tracking branch 'upstream/develop' into 13a11
2020-09-08 05:01:36 +02:00
Alexandre SPANGARO
a050ee8385
Typo
2020-09-08 04:24:27 +02:00
Laurent Destailleur
c91338198d
Add some fields in candidature
...
Look and feel v13
2020-09-08 01:53:37 +02:00
lvessiller
86ce4315be
FIX load default linked options for linked sellist extra fields
2020-09-07 15:19:58 +02:00
lvessiller
5dee3b5b2f
FIX no empty value in required extrafield
2020-09-07 14:24:09 +02:00
Laurent Destailleur
b1e45aef46
Debug opensurvey. Look and feel v13. Removed deprecated properties.
2020-09-07 12:04:50 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-07 08:18:17 +00:00
Laurent Destailleur
d700649fb9
The deprecated subsitution key __SIGNATURE__ has been removed. Replace
...
with __USER_SIGNATURE__ if you still use old syntax in your email
templates.
2020-09-06 19:25:25 +02:00
Laurent Destailleur
84efd70dcb
FIX Clean tooltip of help for substition for long notes
2020-09-06 19:19:55 +02:00
bahfir abbes
77afbd4412
fix : unuseful truncation of list name elements
2020-09-04 15:58:21 +01:00
Laurent Destailleur
7094cec42a
Fix use same duration code 'on 1 letter' than the production duration
...
record, also than tha sprintf.
2020-09-04 14:37:55 +02:00
Juanjo Menent
9bd5ed627f
Fix travis issues
2020-09-04 09:55:02 +02:00
Juanjo Menent
bb92e64e43
FIX : #14474 Error when deleting
2020-09-03 12:43:38 +02:00
Laurent Destailleur
4da10b5f63
Merge pull request #14614 from aspangaro/13a10
...
New Accountancy Add predefined url in getNomUrl
2020-09-03 12:34:24 +02:00
atm-lena
197d03f9d9
FIX selectModelMail() : if default and no mail models select default model
2020-09-03 09:23:10 +02:00
Alexandre SPANGARO
b3cd9688d5
Typo
2020-09-02 23:43:47 +02:00
Laurent Destailleur
ed743c9dbb
Fix phpcs
...
More secured sendEmailsReminder()
2020-09-02 21:39:22 +02:00
Laurent Destailleur
9868140693
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-09-02 19:20:12 +02:00
Laurent Destailleur
4dca1929e0
Can close a recruitment job
2020-09-02 19:19:47 +02:00
Laurent Destailleur
6ccec31fa0
Merge pull request #14605 from Tim-Otte/fix-contact-type-translation
...
FIX: Contact type translation
2020-09-02 18:09:37 +02:00
Laurent Destailleur
6d52721246
Merge pull request #14609 from atm-lena/NEW_AddDefaultMailModelToSelect_EventReminder
...
Event Reminder : Add "Default Mail Model" to select Mail Model
2020-09-02 18:08:40 +02:00
Laurent Destailleur
de3e818ccf
Update html.form.class.php
2020-09-02 18:08:08 +02:00
lvessiller
27c754e6c8
NEW add send context for ticket
2020-09-02 15:33:18 +02:00
atm-lena
7b91c8efc8
Event Reminder : Add "Default Mail Model" to select Mail Model
2020-09-02 09:58:55 +02:00
Tim Otte
8a5a171cf8
Added agenda translation
2020-09-01 16:59:40 +02:00
Tim Otte
71471a054d
Loaded the required translations
2020-09-01 16:53:42 +02:00
Florian Mortgat
134a47a93f
FIX 10.0 - when the mime file name is different from the filesystem name, the attachment name should be the mime filename
2020-09-01 15:36:35 +02:00
atm-lena
d2ed43d913
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind_Part2
2020-09-01 09:43:14 +02:00
Laurent Destailleur
9dbc9582c1
Code comment
2020-08-31 17:12:31 +02:00
Laurent Destailleur
0a93954134
Fix regresssion. The reply_to was missing with SMTPS
2020-08-31 17:07:13 +02:00
Laurent Destailleur
49a4f4f1a1
More log
2020-08-31 17:00:43 +02:00
Laurent Destailleur
ffb3d810de
Complete fix for #14580 for v10 (backport of change of develop)
2020-08-31 16:21:59 +02:00
atm-lena
f8c79db4a9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind_Part2
2020-08-31 14:14:27 +02:00
Laurent Destailleur
8adf1852b1
Clean code
2020-08-30 03:00:35 +02:00
Laurent Destailleur
9cba23e458
Fix phpcs
2020-08-29 06:10:18 +02:00
Laurent Destailleur
bca9a84710
Enhance autofill of end date when creating an event
2020-08-29 06:05:52 +02:00
Laurent Destailleur
b721930b3b
Merge pull request #14568 from atm-lena/NEW_AgendaEvent_Remind
...
Agenda Remind (Part 1)
2020-08-29 05:19:21 +02:00
Laurent Destailleur
723a263cd3
Fix phpcs
2020-08-29 05:07:23 +02:00
Laurent Destailleur
bd201052de
Update html.form.class.php
2020-08-29 04:58:07 +02:00
Laurent Destailleur
ca47eb2c9f
Update html.form.class.php
2020-08-29 04:55:24 +02:00
Laurent Destailleur
0acb33fc91
Merge pull request #14582 from OPEN-DSI/new-ticket-remove-new-lines-in-mail
...
NEW remove new lines in mail on add ticket message
2020-08-28 21:08:17 +02:00
lvessiller
c3b095c820
NEW remove new lines in mail on add ticket message
2020-08-28 17:54:57 +02:00
Laurent Destailleur
50b791cfca
Fix css
2020-08-28 17:41:15 +02:00
Laurent Destailleur
9950f2ea83
Merge pull request #14581 from OPEN-DSI/new-ticket-add-subject-company-name
...
NEW subject title with company name instead of application title in t…
2020-08-28 17:36:38 +02:00
Laurent Destailleur
0b8d7f329e
FIX added information on user list not visible with multiselect
2020-08-28 17:17:22 +02:00
lvessiller
49098218cb
NEW subject title with company name instead of application title in ticket message
2020-08-28 16:55:28 +02:00
Laurent Destailleur
4ecd15b7ab
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/langs/en_US/main.lang
2020-08-27 21:57:42 +02:00
Laurent Destailleur
1b77dc4e13
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-08-27 21:19:06 +02:00
Laurent Destailleur
fe4acf4e4e
NEW Add focus when editing on product/stock/product.php Close #14548
2020-08-27 21:18:40 +02:00
Laurent Destailleur
5c1680e9c5
Merge branch 'develop' into master
2020-08-27 19:58:29 +02:00
Laurent Destailleur
8a9244d1d6
Merge pull request #14567 from TobiasSekan/ShowRefInContractFormOnInterventions
...
NEW - Show references in contract form on interventions
2020-08-27 19:44:51 +02:00
Laurent Destailleur
6715eaee09
Update html.formcontract.class.php
2020-08-27 19:44:17 +02:00
atm-lena
acb50950a4
Add a default message to "actioncomm_send" template
2020-08-27 11:31:48 +02:00
stickler-ci
8ff24282d9
Fixing style errors.
2020-08-27 08:16:32 +00:00
Sekan, Tobias
c2590433fe
Show ref in contract form on interventions
2020-08-27 10:11:18 +02:00
atm-lena
c10556473f
Clean
2020-08-26 15:35:12 +02:00
atm-lena
1267e914dc
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind
2020-08-26 15:16:53 +02:00
atm-lena
d4e6a9871c
Update select_type_duration() function
2020-08-26 15:14:07 +02:00
atm-lena
a4018f41f7
WIP
2020-08-26 10:52:36 +02:00
Laurent Destailleur
23bb67873f
NEW Can edit the list of sending email profiles.
2020-08-25 19:40:17 +02:00
atm-lena
7df993c7ed
Add "select_model_mail" function + add select to create event
2020-08-25 17:26:32 +02:00
atm-lena
25840c2b3d
Create Event - Add fields
2020-08-25 12:40:29 +02:00
andreubisquerra
f9913be719
Change variable to pos_change
2020-08-23 22:24:46 +02:00
Laurent Destailleur
b600478a5a
Work on recruitment module
2020-08-23 22:11:16 +02:00
Laurent Destailleur
bd7261a449
Debug recruitment module
2020-08-23 18:04:52 +02:00
Laurent Destailleur
a4c34c2bc5
NEW Add Manufacturing Orders into the automatic ECM
2020-08-23 15:19:03 +02:00
Alexandre SPANGARO
bf28201685
Fix Missing language key
2020-08-23 07:13:43 +02:00
Laurent Destailleur
a265bec7ca
NEW Events in agenda for contact
...
FIX Saving contacts of an events
2020-08-23 02:38:56 +02:00
jove@bisquerra.com
d9cbd8f998
NEW: Print payment method and change in TakePOS
2020-08-22 18:28:15 +02:00
Laurent Destailleur
03af14294a
Standardize code. Debug module HRM
2020-08-22 15:29:19 +02:00
Laurent Destailleur
dabe804299
Add numbering modules for candidatures. Mass action Validate.
2020-08-22 03:49:46 +02:00
Laurent Destailleur
220fc6db98
Work on recruitment module
2020-08-21 13:00:12 +02:00
Laurent Destailleur
ad0625b6ec
Debug posting message from ticket page
2020-08-21 01:11:22 +02:00
Laurent Destailleur
66f9f37f41
Minor code and doc enhancement
2020-08-20 19:00:43 +02:00
Laurent Destailleur
7217dc3114
Better perf for phpunit on very large databases
2020-08-19 01:43:48 +02:00
Laurent Destailleur
964c4ef0d2
Standardize code. Use model_pdf.
2020-08-18 14:48:38 +02:00
Laurent Destailleur
e65e4a6d47
Beautify for of member module
2020-08-18 11:52:00 +02:00
Laurent Destailleur
24703b8fe7
Merge pull request #14487 from aspangaro/13a4
...
NEW Add a start date to begin binding in accountancy
2020-08-17 22:20:46 +02:00
Laurent Destailleur
bd65e5612f
Fix duplicate id
2020-08-17 20:06:01 +02:00
Laurent Destailleur
c63d54631c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/categories/class/categorie.class.php
2020-08-17 19:59:17 +02:00
Laurent Destailleur
487d26c7db
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
2020-08-17 19:54:23 +02:00
Laurent Destailleur
8bfa6df1a6
FIX Update extrafields on line only if it is supported
...
Conflicts:
htdocs/modulebuilder/template/class/myobject.class.php
2020-08-17 16:06:36 +02:00
Laurent Destailleur
8e00c9c304
FIX Update extrafields on line only if it is supported
2020-08-17 15:53:33 +02:00
Alexandre SPANGARO
498431fa6f
NEW Add a start date to begin binding in accountancy
2020-08-17 15:27:05 +02:00
Laurent Destailleur
99809b487e
Standardize code
2020-08-16 23:33:50 +02:00
Alexandre SPANGARO
27c36713d3
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-08-16 22:10:02 +02:00
lvessiller
d5acc85ef0
FIX param entity in html form file
2020-08-14 12:18:28 +02:00
Laurent Destailleur
0381cf5665
Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop
...
Conflicts:
htdocs/core/modules/modPaymentByBankTransfer.class.php
htdocs/filefunc.inc.php
2020-08-14 11:08:53 +02:00
Laurent Destailleur
056a503200
Merge branch '11.0' of https://github.com/dolibarr/dolibarr into 12.0
...
Conflicts:
htdocs/product/composition/card.php
2020-08-14 11:06:39 +02:00
Laurent Destailleur
030df58fea
Fix regression in sending emails
2020-08-07 17:11:23 +02:00
Laurent Destailleur
795754273e
Fix regression in sending emails
2020-08-07 17:06:57 +02:00
Laurent Destailleur
bd5c4603e3
Fix regression in sending emails
2020-08-07 17:06:12 +02:00
Laurent Destailleur
00804c1020
Complete fix for #14146
2020-08-07 15:19:26 +02:00
Laurent Destailleur
6fd433167f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/CMailFile.class.php
2020-08-07 11:59:55 +02:00
Laurent Destailleur
284378232b
Merge pull request #14373 from atm-john/11.0_fix_bad_usage_of_moreparam
...
FIX : JS CRASH - bad usage of moreparam
2020-08-07 10:10:09 +02:00
florian HENRY
46cafcc445
Merge branch '11.0' into 12.0
2020-08-06 16:54:49 +02:00
florian HENRY
3e6ae9bebf
Merge branch '10.0' into 11.0
2020-08-06 16:34:45 +02:00
florian HENRY
53acd8cffd
FIX: MAIN_MAIL_FORCE_SENDTO work now for all mail sending method
2020-08-06 16:28:17 +02:00
Laurent Destailleur
1f02b33195
Work on inventory
2020-08-05 12:25:26 +02:00
John Botella
11f14b8fe5
Fix bad usage of moreparam
2020-08-04 14:13:52 +02:00
Laurent Destailleur
4c1aa25b32
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/admin/adherent_emails.php
htdocs/core/tpl/extrafields_list_search_title.tpl.php
htdocs/product/traduction.php
2020-08-04 13:51:11 +02:00
Laurent Destailleur
2076d18825
FIX Param of fetch_name_optionals_label must be object->table_element
2020-08-04 12:47:09 +02:00
Tim Otte
0e03578e91
Fixed translation of product units in documents
2020-08-04 11:51:40 +02:00
Laurent Destailleur
e455f8afa6
Merge pull request #14369 from Tim-Otte/fix-product-unit-translation
...
Fixed translation of product units in documents
2020-08-04 11:50:50 +02:00
Tim Otte
360afccecc
Fixed translation of product units in documents
2020-08-04 11:02:16 +02:00
VERDOL Gauthier
2d192431bc
FIX : wrong element var for fetch_name_optionals_label function with expeditions
2020-08-03 14:59:51 +02:00
Laurent Destailleur
fb811a1656
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/database-tables.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/commonobject.class.php
htdocs/langs/fr_FR/withdrawals.lang
htdocs/societe/class/societe.class.php
2020-08-03 14:44:01 +02:00
Laurent Destailleur
defbd26f95
Help to fight errors ErrorBadValueForParamNotAString
2020-08-03 12:33:22 +02:00
Laurent Destailleur
c2bb0431f0
FIX input field of extrafields must keep data if form submit fails.
2020-08-03 12:31:30 +02:00
Laurent Destailleur
d59bcd3f5b
FFIX error creating record when extrafields price exists in other entity
2020-08-03 12:08:33 +02:00
Laurent Destailleur
7297950308
Merge pull request #13759 from OPEN-DSI/stcommcontact
...
NEW: Add prospect status managment for the contact with managment of custom icon
2020-08-02 22:01:00 +02:00
Laurent Destailleur
7149cbb532
NEW Add public note on products. This also partially fix the #14342
2020-08-02 17:09:21 +02:00
Laurent Destailleur
be34a2c607
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/cashdesk.lang
htdocs/product/stock/list.php
2020-08-02 16:06:51 +02:00
Laurent Destailleur
ecfdb4bbac
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-08-02 16:02:09 +02:00
Laurent Destailleur
5e6254634f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-08-02 16:01:13 +02:00
Laurent Destailleur
1edfa4a4fb
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/html.form.class.php
2020-08-02 16:01:03 +02:00
Laurent Destailleur
8c4b4e233d
Merge pull request #14317 from fappels/12_show_virtual_stock
...
Fix hidden option STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO
2020-08-02 01:32:18 +02:00
kkhelifa-opendsi
fe0f77b967
Merge branch 'develop' into stcommcontact
2020-07-31 16:41:17 +02:00
Laurent Destailleur
d4e21538db
FIX Debug setup of receipt printer module
2020-07-31 13:40:36 +02:00
altairis
9a9eef428b
fix duration fields size with firefox
2020-07-31 12:22:21 +02:00
Laurent Destailleur
0bf678e09e
Fix label of extrafields
2020-07-30 14:57:33 +02:00
Laurent Destailleur
8b879ee23b
FIX Edit extrafield of type long text loose carriage returns
2020-07-30 14:49:00 +02:00
Francis Appels
54410189bc
Fix hidden option STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO
...
When product ajax search used a dash is show, so virtual stock looks like being negative value.
2020-07-29 17:00:39 +02:00
Laurent Destailleur
3d79950c27
Update commonobject.class.php
2020-07-29 14:13:29 +02:00
Laurent Destailleur
91a50038ff
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/fiche-stat.php
2020-07-27 19:35:34 +02:00
Laurent Destailleur
714481f7e5
FIX Navigation in object fails to find the next ref in some cases
2020-07-26 21:08:31 +02:00
Laurent Destailleur
a2dd80bcc8
FIX Navigation in object fails to find the next ref in some cases
2020-07-26 21:07:39 +02:00
Laurent Destailleur
b63a6bc72a
NEW Can use dynamic code into the 'enabled' property of DAO fields
2020-07-26 20:45:54 +02:00
Laurent Destailleur
f68be08c67
Merge pull request #14198 from Gecka-Apps/12.0-printStdColumnContent-hook-improve
...
Improve printStdColumnContent by passing the $pdf object
2020-07-24 13:20:03 +02:00
Laurent Destailleur
42234ba506
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/price.lib.php
2020-07-24 00:07:57 +02:00
quentin
255bd6b26c
FIX null required
2020-07-22 11:54:52 +02:00
Laurent Dinclaux
3cdabbaaff
Explicitly pass the pdf object by reference in the printStdColumnContent hook call.
2020-07-19 21:53:06 +11:00
Laurent Destailleur
cbc8187616
Merge pull request #14205 from Gecka-Apps/12.0-fix-extra-field-ordering
...
Fix extrafields ordering on PDFs
2020-07-18 19:30:34 +02:00
Laurent Destailleur
0d24b979c1
Fix phpcs
2020-07-11 01:20:20 +02:00
Laurent Destailleur
bb056fc811
Fix bad return value
2020-07-10 03:02:49 +02:00
Laurent Destailleur
f2c84fba3d
Merge pull request #14202 from pstructures/PSdevelop
...
Added Hook to showOptionals Function
2020-07-10 02:54:05 +02:00
Laurent Destailleur
96c583b84e
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-10 02:28:34 +02:00
Laurent Destailleur
87913e8a5c
Fix prospect before customer
2020-07-10 02:11:23 +02:00
Laurent Destailleur
b8721e0c64
FIX Change position of line in BOM
2020-07-09 16:00:15 +02:00
Laurent Dinclaux
6ed2ae188e
Fix extrafields ordering on PDFs
2020-07-10 00:51:41 +11:00
Matt Sidnell
39104009ef
Updated to match inline with code received from fork
2020-07-08 14:25:37 +01:00
Matt Sidnell
580b9db3e7
Updated Hook in showOptionals function to allow the manipulation of optional fields on cards etc...
2020-07-08 14:20:59 +01:00
Laurent Dinclaux
37401df106
Improve printStdColumnContent by passing the $pdf object.
...
It isn't possible to replace the pdf edition done by this method without the $pdf object.
2020-07-08 14:48:34 +11:00
Laurent Destailleur
70c3146aba
Merge pull request #14106 from OPEN-DSI/new-extrafields-category-multi-select-with-link
...
NEW show links for select and multi-select in category extra field
2020-07-06 12:12:31 +02:00
Laurent Destailleur
eb7f3b81d3
Merge pull request #14187 from atm-john/10.0_fix_email_spoofing
...
Fix email spoofing - with hidden conf
2020-07-06 12:01:35 +02:00
Laurent Destailleur
42917000a3
Update CMailFile.class.php
2020-07-06 12:01:00 +02:00
Laurent Destailleur
2f04b4c559
Update CMailFile.class.php
2020-07-06 12:00:14 +02:00
stickler-ci
cb7b66d52c
Fixing style errors.
2020-07-06 09:19:27 +00:00
Alexandre SPANGARO
82c96a4f83
Fix SticklerCi
2020-07-06 04:47:27 +02:00
Alexandre SPANGARO
59ee22537d
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-07-06 03:24:27 +02:00
Laurent Destailleur
344098fe23
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contrat/card.php
htdocs/core/actions_fetchobject.inc.php
htdocs/langs/fr_FR/contracts.lang
htdocs/langs/fr_FR/loan.lang
htdocs/langs/fr_FR/stocks.lang
2020-07-05 13:01:00 +02:00
Laurent Destailleur
b726e96f4b
FIX Update form erased extrafields that were hidden
2020-07-04 17:09:20 +02:00
Laurent Destailleur
1c19c97cf2
FIX missing setup of extrafields for MO
...
FIX all extrafields cleared after update of one of them
FIX Update of extrafields date
FIX Update of extrafiels on draft object
FIX Sql type
Fix trans on BOM
2020-07-04 16:14:53 +02:00
Laurent Destailleur
83eaddb17b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/evalmath.class.php
htdocs/core/class/extrafields.class.php
htdocs/install/mysql/migration/11.0.0-12.0.0.sql
htdocs/langs/en_US/cashdesk.lang
htdocs/societe/class/societe.class.php
2020-07-04 13:13:17 +02:00
Laurent Destailleur
94188af270
Merge pull request #14056 from atm-quentin/NEW_filter_on_event_tab
...
NEW multiselect type and date to date filter
2020-07-03 00:57:44 +02:00
Laurent Destailleur
03aa4873d1
Merge pull request #14141 from fappels/12_fix_extrafield_html
...
FIX html lost on html extrafield
2020-07-03 00:49:31 +02:00
Laurent Destailleur
fd617658ef
Fix syntax
2020-07-03 00:36:56 +02:00
Je2fb
b45bfd258d
fix #14143
2020-07-03 00:34:50 +02:00
Laurent Destailleur
a08e4bdf3f
Merge pull request #14163 from atm-quentin/FIX_line_reorder_rank_develop
...
NEW get all child recursively
2020-07-03 00:28:32 +02:00
Laurent Destailleur
a44f5376da
Update commonobject.class.php
2020-07-03 00:27:30 +02:00
Laurent Destailleur
bc1006e875
Merge pull request #14159 from Je2fb/develop
...
FIX #14143 DynamicPrice
2020-07-03 00:25:38 +02:00
Laurent Destailleur
6b16f64928
Fix properties used that does not exists
2020-07-02 03:39:47 +02:00
Laurent Destailleur
ca769a3c62
Fix scrutinizer errors
2020-07-02 03:37:01 +02:00
Laurent Destailleur
d3c23428d5
FIX Use of office365 TLS with SMTPs method.
...
Conflicts:
htdocs/core/class/smtps.class.php
2020-07-01 17:11:13 +02:00
Laurent Destailleur
324c8e9b54
FIX Use of office365 TLS with SMTPs method.
...
Conflicts:
htdocs/core/class/smtps.class.php
2020-07-01 17:10:33 +02:00
Laurent Destailleur
92a36dbeee
FIX Use of office365 TLS with SMTPs method.
2020-07-01 17:01:46 +02:00
Laurent Destailleur
226c907e35
FIX Use of office365 TLS with SMTPs method.
2020-07-01 17:00:52 +02:00
John Botella
2a9311b2d8
Fix email spoofing - with hidden conf
2020-07-01 16:55:23 +02:00
quentin
d2a364eea8
NEW get all child recursively
2020-07-01 14:10:43 +02:00
quentin
39651953b3
FIX refacto
2020-07-01 14:04:41 +02:00
quentin
267aa7605b
Merge remote-tracking branch 'dolibarr/develop' into NEW_filter_on_event_tab
2020-07-01 14:00:49 +02:00
Laurent Destailleur
b8ea58f18c
Fix phpcs
2020-06-30 16:15:10 +02:00
Laurent Destailleur
4baa00ba89
Fix phpcs
2020-06-30 13:20:46 +02:00
Laurent Destailleur
88cf904ced
Fix edit of tag of website
2020-06-30 02:50:58 +02:00
Laurent Destailleur
bb74804b74
NEW Add option TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT
2020-06-29 17:58:04 +02:00
Francis Appels
5d65b5f660
fix html should not do price2num
2020-06-29 09:07:54 +02:00
Laurent Destailleur
ab88890f3a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-28 21:48:28 +02:00
Laurent Destailleur
b725aca8aa
Merge branch 'develop' into 11.0_bug
2020-06-28 21:19:11 +02:00
Laurent Destailleur
a3ae7a76b8
WIP Stock at date
2020-06-28 19:35:24 +02:00
Je2fb
245ba93895
fix #14143
2020-06-28 17:53:48 +02:00
Francis Appels
731978fda6
FIX html lost on html extrafield
2020-06-28 16:33:44 +02:00
Laurent Destailleur
194b92e70f
Fix load of menu when 'perm' or 'enabled' is '0'.
2020-06-27 15:27:09 +02:00
Laurent Destailleur
4d01030fd9
Fix phpcs
2020-06-27 02:00:42 +02:00
Laurent Destailleur
ec5cfee150
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-27 01:57:18 +02:00
Laurent Destailleur
443558e3a2
Fix phpcs
2020-06-27 01:57:01 +02:00
Laurent Destailleur
90d4458aab
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2020-06-27 00:38:51 +02:00
Laurent Destailleur
3655f6f407
FIX #14109
2020-06-26 20:38:41 +02:00
Laurent Destailleur
6df049e05c
FIX #14112
2020-06-26 20:35:06 +02:00
Laurent Destailleur
d6346522b8
Code comment
2020-06-26 19:36:15 +02:00
Laurent Destailleur
b0d46d0c4c
Code comment
2020-06-26 18:56:05 +02:00
Laurent Destailleur
29ba9c82c3
Fix #14120
2020-06-26 17:17:13 +02:00
gauthier
858a751eef
FIX : $_POST must be GETPOST
2020-06-26 10:51:04 +02:00
Laurent Destailleur
e2b1b853c0
Minor performance enhancements
2020-06-26 01:44:21 +02:00
Laurent Destailleur
333d4873c3
Properties ->contactid has been renamed into ->contact_id
2020-06-25 12:17:47 +02:00
Laurent Destailleur
ee5156034d
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-24 20:03:40 +02:00
Laurent Destailleur
02e022ebfa
Fix class not found for supplier credit. Class must be into
...
commoninvoice
2020-06-24 19:59:06 +02:00
Laurent Destailleur
de62037ba5
Fix signed only in margin calculation of project
2020-06-24 12:58:10 +02:00
Laurent Destailleur
6d25b8630b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/prelevement.php
htdocs/core/class/rssparser.class.php
2020-06-23 11:38:20 +02:00
Regis Houssin
32844a8d0c
FIX clean code
2020-06-22 09:26:42 +02:00
lvessiller
bf338b4d4f
NEW show links for select and multi-select in category extra field
2020-06-22 08:57:52 +02:00
Laurent Destailleur
1ce5b78a6b
Fix error message not reported
2020-06-22 01:02:17 +02:00
Regis Houssin
9a4f5e3d9a
FIX We force "modify" for avoid some field not modify
2020-06-21 21:10:51 +02:00
Laurent Destailleur
501fd2f7a3
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/takepos/admin/receipt.php
2020-06-21 20:48:41 +02:00
Regis Houssin
03fbd72d66
FIX For better compatibility with Samba4 AD
2020-06-21 19:52:15 +02:00
Laurent Destailleur
ccc55dcb1e
Debug Receipt printer module and reduce duplicate translation key
2020-06-20 15:19:19 +02:00
Laurent Destailleur
c54294285a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
2020-06-20 12:28:14 +02:00
Laurent Destailleur
2de3eb8ac0
Fix CSS
2020-06-20 00:00:17 +02:00
Laurent Destailleur
4627f06c70
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-16 22:57:50 +02:00
Laurent Destailleur
9ec8051a37
NEW Add param to not show links when output tags
2020-06-16 02:56:48 +02:00
Laurent Destailleur
b7d835eceb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-06-15 16:10:27 +02:00
Laurent Destailleur
1ba03566dc
Fix case of delete contact not correctly implemented.
2020-06-12 02:15:02 +02:00
Laurent Destailleur
012574b487
Update html.form.class.php
2020-06-12 00:51:19 +02:00
Laurent Destailleur
d7cbd8a1d4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-11 23:41:43 +02:00
Laurent Destailleur
90b5ed9908
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/website.lib.php
2020-06-11 23:41:35 +02:00
Laurent Destailleur
e087edf005
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/class/html.formticket.class.php
htdocs/ticket/class/ticket.class.php
2020-06-11 23:39:26 +02:00
Laurent Destailleur
e04557948d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-06-11 23:37:04 +02:00
Laurent Destailleur
2109a91992
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/html.formticket.class.php
htdocs/takepos/admin/setup.php
2020-06-11 23:36:55 +02:00
Laurent Destailleur
073a4acd10
Merge pull request #14058 from indelog/showmailpj
...
NEW Add show preview for mail attachement on form mail
2020-06-11 23:09:26 +02:00
Laurent Destailleur
b36e658b20
Update html.formticket.class.php
2020-06-11 22:58:58 +02:00
Laurent Destailleur
ee611fa7a0
Fix bad definition of field for parent
2020-06-11 18:32:05 +02:00
Laurent Destailleur
c289001507
Fix bad definition of field for parent
2020-06-11 18:31:26 +02:00
gauthier
58ff96af30
FIX : $arraydefaultmessage is an object, as well as in /htdocs/core/class/html.formmail.class.php
2020-06-10 16:48:02 +02:00
DEMAREST Maxime (Indelog)
1ac341e651
Fix undef func measuringUnitString() in From::select_produits_fournisseurs_list
2020-06-09 15:33:10 +02:00
DEMAREST Maxime (Indelog)
e628730a3f
Add show preview for mail attachement on form mail
2020-06-09 11:35:46 +02:00
Laurent Destailleur
ff9312c96a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/card.php
htdocs/compta/prelevement/class/ligneprelevement.class.php
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/line.php
2020-06-08 20:36:54 +02:00
atm-quentin
3dd7c81f54
FIX stickler
2020-06-08 15:58:20 +02:00
Laurent Destailleur
f4f0da6de2
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-06-08 15:42:27 +02:00
Laurent Destailleur
366f458b39
Show more info to help fix corrupted data
2020-06-08 15:20:01 +02:00
Laurent Destailleur
fd8f8ff4e1
Error message
2020-06-08 15:12:07 +02:00
atm-quentin
69db790cf5
NEW multiselect type and date to date filter
2020-06-08 14:43:14 +02:00
Laurent Destailleur
6f12488e30
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/filefunc.inc.php
2020-06-07 19:55:48 +02:00
Laurent Destailleur
09047dc19c
Doc
2020-06-07 19:26:37 +02:00
Laurent Destailleur
81c80b254e
Fix lang property on database menu entry was not propagated
2020-06-07 19:25:25 +02:00
Laurent Destailleur
7d3039d41f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/user/card.php
2020-06-06 23:04:55 +02:00
Laurent Destailleur
19405d5f5b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/langs/en_US/admin.lang
2020-06-06 23:02:05 +02:00
Laurent Destailleur
cbafbe16a2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/accountancy/supplier/index.php
htdocs/admin/mails_templates.php
htdocs/core/class/html.form.class.php
htdocs/core/class/html.formticket.class.php
htdocs/langs/en_US/admin.lang
2020-06-06 23:00:24 +02:00
Laurent Destailleur
b221c65165
Merge
2020-06-06 21:56:23 +02:00
Laurent Destailleur
b386400365
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-06-06 21:52:55 +02:00
Laurent Destailleur
261d0772f8
Update commonobject.class.php
2020-06-06 21:47:27 +02:00
Laurent Destailleur
bb192195f1
Update commonobject.class.php
2020-06-06 21:41:33 +02:00
Laurent Destailleur
87806346c7
Update commonobject.class.php
2020-06-06 21:40:20 +02:00
Laurent Destailleur
d9ac7ab9da
Update commonobject.class.php
2020-06-06 21:37:53 +02:00
Laurent Destailleur
a66926cf08
Update commonobject.class.php
2020-06-06 21:30:08 +02:00
Laurent Destailleur
4f2af3bf67
Merge pull request #14021 from atm-gauthier/10.0_fix_modelmail_tickets
...
FIX : Tickets mail models doesn't work
2020-06-06 21:24:04 +02:00
Laurent Destailleur
30c6ae394b
Update html.formticket.class.php
2020-06-06 21:23:35 +02:00
Laurent Destailleur
da672c8776
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/admin/translation.php
htdocs/core/class/html.formfile.class.php
htdocs/societe/card.php
2020-06-06 11:57:31 +02:00
Laurent Destailleur
d252248319
Fix back to link in ECM menu
...
Fix picto in search_page
2020-06-05 13:41:33 +02:00
florian HENRY
699557adbe
forget[]
2020-06-04 21:39:23 +02:00
florian HENRY
afafe1a737
forget[]
2020-06-04 21:38:44 +02:00
florian HENRY
29649a1e2a
Merge branch '11.0' of github.com:atm-florian/dolibarr into 11.0
2020-06-04 20:21:17 +02:00
stickler-ci
e9b17aac8d
Fixing style errors.
2020-06-04 18:20:48 +00:00
florian HENRY
b47761e05c
fix comment
2020-06-04 20:20:43 +02:00
florian HENRY
7115bd7033
better fix
2020-06-04 20:14:19 +02:00
Alexandre SPANGARO
ede084a111
Fix stickler
2020-06-04 05:11:00 +02:00
Alexandre SPANGARO
9e5c7d0acf
FIX: Show ref_customer, amount on contract link object
2020-06-03 23:00:53 +02:00
Laurent Destailleur
8023bc2fbb
Fix cancel in media filemanager
2020-06-03 12:39:06 +02:00
Laurent Destailleur
ae3d786593
Fix crop on media file manager
...
Conflicts:
htdocs/core/ajax/ajaxdirpreview.php
htdocs/core/photos_resize.php
htdocs/theme/eldy/global.inc.php
2020-06-03 12:38:42 +02:00
Laurent Destailleur
93320deddc
Fix cancel in media filemanager
2020-06-03 12:34:09 +02:00
Laurent Destailleur
8894570054
Fix crop on media file manager
2020-06-03 11:20:59 +02:00
Laurent Destailleur
a37a4031e9
FIX Delete of website page need permission. Conflict with mass action.
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/website/index.php
2020-06-03 01:02:19 +02:00
Laurent Destailleur
d4db1836d1
FIX Delete of website page need permission. Conflict with mass action.
2020-06-03 00:46:09 +02:00
gauthier
68bb552dcc
FIX : Tickets mail models doesn't work
2020-06-02 17:06:49 +02:00
Laurent Destailleur
658e7a2f87
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-02 13:32:09 +02:00
Laurent Destailleur
9a30d4ca44
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-02 13:32:02 +02:00
Laurent Destailleur
6ddabd51c0
Update commonobject.class.php
2020-06-01 21:03:42 +02:00
bahfir abbes
f2c7db63cf
fix:le résultat de explode est troujours un array
2020-06-01 21:02:45 +02:00
Laurent Destailleur
14a3ab68e6
Merge pull request #14008 from bafbes/abb110217
...
fix:the result of explode is always an array
2020-06-01 21:02:15 +02:00
Laurent Destailleur
d3a769a0ab
Update commonobject.class.php
2020-06-01 21:02:05 +02:00
Laurent Destailleur
0f5eed60a2
Update commonobject.class.php
2020-06-01 20:41:12 +02:00
bahfir abbes
2984edc752
fix:bad database quotation for booleans
2020-06-01 20:40:51 +02:00
Laurent Destailleur
9bf69f11c4
Merge pull request #14010 from bafbes/abb110220
...
fix:bad database quotation for booleans
2020-06-01 20:39:58 +02:00
Laurent Destailleur
2dac87621a
Update commonobject.class.php
2020-06-01 20:39:49 +02:00
Laurent Destailleur
69c3b4b4ea
Merge pull request #14015 from ptibogxiv/patch-342
...
FIX php error
2020-06-01 20:17:22 +02:00
Laurent Destailleur
b20e8b9d6b
Merge pull request #14013 from bafbes/abb110222
...
fix:this is required to navigate by id
2020-06-01 20:15:48 +02:00
Laurent Destailleur
0362d28cf7
Update commonobject.class.php
2020-06-01 20:13:27 +02:00
Laurent Destailleur
2324834b73
Debug modulebuilder for doc generation
...
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/modulebuilder/template/admin/setup.php
2020-06-01 16:47:50 +02:00
Laurent Destailleur
58e76947ac
Debug modulebuilder for doc generation
2020-06-01 16:44:22 +02:00
florian HENRY
2337d75d92
better fix for #13968
2020-06-01 10:43:57 +02:00
Laurent Destailleur
4af17a342c
Doc
2020-06-01 00:00:24 +02:00
Laurent Destailleur
c04903d15c
Fix debug modulebuilder for doc and ref generation
...
Conflicts:
htdocs/core/class/commonobject.class.php
2020-05-31 23:01:13 +02:00
Laurent Destailleur
e2bb04dcae
Fix debug modulebuilder for doc and ref generation
2020-05-31 22:59:33 +02:00
ptibogxiv
a33f503a0d
FIX php error
...
Fatal error: Uncaught Error: Call to undefined function getCountry() in /volume2/web/dolibarr/htdocs/core/class/html.form.class.php on line 2583 Error: Call to undefined function getCountry() in /volume2/web/dolibarr/htdocs/core/class/html.form.class.php on line 2583 Call Stack: 0.0001 409544 1. {main}() /volume2/web/dolibarr/htdocs/adherents/admin/adherent.php:0 0.1935 3017200 2. Form->select_produits() /volume2/web/dolibarr/htdocs/adherents/admin/adherent.php:215 0.1935 3017200 3. Form->select_produits_list() /volume2/web/dolibarr/htdocs/core/class/html.form.class.php:2134 0.1983 3439880 4. Form->constructProductListOption() /volume2/web/dolibarr/htdocs/core/class/html.form.class.php:2451
2020-05-31 14:28:41 +02:00
bahfir abbes
f76c025a7b
fix:this is required to navigate by id
2020-05-31 02:01:33 +01:00
bahfir abbes
e5a51eb732
fix:bad database quotation for booleans
2020-05-31 01:41:04 +01:00
bahfir abbes
d6247bfc97
fix:le résultat de explode est troujours un array
2020-05-31 01:23:35 +01:00
Laurent Destailleur
82455681d6
Merge pull request #13582 from TobiasSekan/UseCatApiForProjectList
...
NEW Use new category API for project list view
2020-05-30 17:22:43 +02:00
Laurent Destailleur
7fc6917cfd
Debug feature of alternate languages
2020-05-29 22:01:02 +02:00
Laurent Destailleur
b3118d0189
Debug feature of alternate languages
2020-05-29 21:59:33 +02:00
Laurent Destailleur
c2a9819daa
Debug establishment management
2020-05-29 21:45:50 +02:00
Laurent Destailleur
b11ef125c3
FIX Force of HTML content only for ckeditor
...
Conflicts:
htdocs/modulebuilder/index.php
2020-05-29 03:27:30 +02:00
Laurent Destailleur
a0a440cf5f
FIX Force of HTML content only for ckeditor
2020-05-29 03:26:05 +02:00
Laurent Destailleur
2836368017
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/filefunc.inc.php
htdocs/takepos/css/phone.css
htdocs/takepos/invoice.php
2020-05-28 20:20:39 +02:00
Laurent Destailleur
3606ed2bda
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/adherents/class/adherent.class.php
2020-05-28 20:17:26 +02:00
Laurent Destailleur
1992b633ba
Fix phpcs
2020-05-28 20:02:07 +02:00
stickler-ci
56259bae9a
Fixing style errors.
2020-05-28 14:18:00 +00:00
glu000
9915d97adf
Fix #13991
2020-05-28 16:11:02 +02:00
Laurent Destailleur
32aecb553b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formmail.class.php
2020-05-28 11:44:58 +02:00
Laurent Destailleur
45615081ec
FIX Bad use/detetion of text/html when forging template email.
2020-05-28 11:41:48 +02:00
Laurent Destailleur
f66555b396
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-27 23:38:46 +02:00
Laurent Destailleur
689289acd0
Doc
2020-05-27 23:20:26 +02:00
Laurent Destailleur
a2a15ceb5b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/demandes.php
htdocs/core/class/html.form.class.php
2020-05-27 23:07:18 +02:00
Laurent Destailleur
ceda05a879
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-05-27 14:39:38 +02:00
Laurent Destailleur
e2680fa29a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/html.form.class.php
2020-05-27 14:39:19 +02:00
Laurent Destailleur
16625af34e
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/files.lib.php
htdocs/core/tpl/filemanager.tpl.php
2020-05-27 14:28:20 +02:00
Laurent Destailleur
3ef1ca1764
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/lib/files.lib.php
htdocs/ecm/class/ecmfiles.class.php
htdocs/ecm/index.php
2020-05-27 14:24:03 +02:00
Laurent Destailleur
a207365bd2
FIX XSS using the renaming of .noexe files - reported by Nolan.
2020-05-27 13:12:18 +02:00
Laurent Destailleur
0b48ffe3cd
Removed not used var $useglobalvars
2020-05-27 11:38:28 +02:00
Laurent Destailleur
00484d5938
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-26 23:23:31 +02:00
Laurent Destailleur
9aeb79e80c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-05-26 23:22:45 +02:00
Laurent Destailleur
e02aa4e41b
FIX Default bank account was not loaded for document generation.
2020-05-26 23:22:14 +02:00
Laurent Destailleur
da8bd7507e
NEW Add mass action to set category on a list of website pages.
2020-05-26 22:29:46 +02:00
Laurent Destailleur
3aaefd15b0
Fix set of categories
2020-05-26 01:07:43 +02:00
Laurent Destailleur
5f90596bb7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-26 00:20:36 +02:00
Laurent Destailleur
ab176cd078
Merge pull request #13937 from frederic34/Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
...
add new rule
2020-05-26 00:20:12 +02:00
Laurent Destailleur
f9f5beb064
NEW Can set tags/categories to website pages.
2020-05-26 00:19:32 +02:00
Laurent Destailleur
80ace3b52c
Revert due to regressions
2020-05-25 23:05:29 +02:00
Laurent Destailleur
a80270ebb5
Revert "clean"
...
This reverts commit 7e7a10f8d2
2020-05-25 23:01:25 +02:00
Laurent Destailleur
faf7a379ba
Revert "clean"
...
This reverts commit 8f9ee3250d
2020-05-25 23:01:20 +02:00
Laurent Destailleur
26eab1f285
Merge pull request #13782 from frederic34/free_email
...
NEW enable free emails input with select2
2020-05-25 22:55:36 +02:00
Laurent Destailleur
40816c02ce
Merge branch 'develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-25 22:40:59 +02:00
Laurent Destailleur
17382051c2
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-25 22:19:50 +02:00
Laurent Destailleur
e4ef6334aa
Look and feel v12
2020-05-25 14:08:36 +02:00
Laurent Destailleur
0b9e1e6ec6
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-25 13:01:49 +02:00
Laurent Destailleur
2595f571c7
Fix exclude credit note when searching situation invoice to use for next
2020-05-25 00:21:09 +02:00
Laurent Destailleur
47465f4108
Fix for situation invoice (exclude credit not when searching last
...
invoice to use)
2020-05-25 00:20:00 +02:00
Laurent Destailleur
aee6fce9f8
Fix remove bad use
2020-05-24 20:04:26 +02:00
Frédéric FRANCE
a7e0fe24ff
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-23 21:44:14 +02:00
Frédéric FRANCE
2085ac73e7
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-23 18:34:58 +02:00
Laurent Destailleur
acaab1fd45
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-23 13:49:15 +02:00
gael.langlais
af5de05a31
Change some curly braces #13929
2020-05-23 13:38:50 +02:00
Laurent Destailleur
76823d3e39
Clean CSS, clean code
2020-05-21 20:59:02 +02:00
Frédéric FRANCE
3a786ca766
add new rule
2020-05-21 15:25:42 +02:00
stickler-ci
459154edc0
Fixing style errors.
2020-05-21 13:11:06 +00:00
Frédéric FRANCE
b41ac00b98
add new rule
2020-05-21 15:05:19 +02:00
Frédéric FRANCE
b58060f899
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-21 13:29:43 +02:00
Laurent Destailleur
8a481b297c
Clean CSS, clean code
2020-05-21 13:06:36 +02:00
Frédéric FRANCE
def53338de
add new rule
2020-05-21 09:07:10 +02:00
Frédéric FRANCE
ee6fadd0d5
add new rule
2020-05-21 01:41:27 +02:00
Laurent Destailleur
15f3c97fff
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-20 23:59:11 +02:00
Laurent Destailleur
036617570e
Doc
2020-05-20 23:46:48 +02:00
Frédéric FRANCE
76bb57bc6b
enhance free email
2020-05-15 18:50:37 +02:00
Frédéric FRANCE
1bc8765291
enhance free email
2020-05-15 18:42:41 +02:00
Frédéric FRANCE
b9a082f774
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-15 18:08:51 +02:00
Frédéric FRANCE
e583dc0a7f
enhance free email
2020-05-15 18:07:17 +02:00
Laurent Destailleur
73cc50e1bf
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-15 17:19:57 +02:00
Laurent Destailleur
70fc74008a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
2020-05-15 17:19:43 +02:00
Laurent Destailleur
86ff60f161
Fix break line and set of opportunity fields
2020-05-15 15:50:50 +02:00
Laurent Destailleur
0091a48f42
Merge pull request #13787 from simicar29/dev-multiplemassaction
...
Enable multiple mass actions on a single page - dev branch
2020-05-15 14:37:33 +02:00
Laurent Destailleur
5933aba38c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-15 14:12:04 +02:00
Laurent Destailleur
0f403ba9ea
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-15 14:11:13 +02:00
Scrutinizer Auto-Fixer
9699ee7263
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-05-15 11:55:31 +00:00
Laurent Destailleur
02b40ae8f6
Fix scrutinizer
2020-05-15 13:54:05 +02:00
Frédéric FRANCE
9afe335e4e
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-14 18:45:52 +02:00
Laurent Destailleur
1bf677f537
Can set status of a websitepage
2020-05-14 18:14:55 +02:00
Laurent Destailleur
ab07330668
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-05-14 16:34:45 +02:00
Laurent Destailleur
6ec5dd02b6
Fix Fatal error with bad triggers
2020-05-14 15:27:10 +02:00
Laurent Destailleur
ae0e6e4dc8
FIX dol_concatdesc to escape <
...
Better help
2020-05-14 14:30:36 +02:00
ATM john
9f6a5d4cc9
Fix multicompany supplier product price filter
2020-05-14 10:50:20 +02:00
Frédéric FRANCE
7e5a07a863
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-12 07:57:32 +02:00
Laurent Destailleur
ed68b73ef5
Merge pull request #13821 from atm-quentin/NEW_invoice_stat_graph_and_categ_search
...
NEW Add invoice stat graph and categ search
2020-05-12 03:31:09 +02:00
Laurent Destailleur
632ca40b1d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-12 03:04:59 +02:00
Laurent Destailleur
75cd7d7e72
Code comment
2020-05-12 03:04:48 +02:00
Frédéric FRANCE
097de7b3cd
Only add empty select if no multiselect
2020-05-11 18:34:54 +02:00
Frédéric FRANCE
3e5489f7f6
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-11 18:17:27 +02:00
Laurent Destailleur
a8dcd2d09b
Clean code
2020-05-11 11:53:13 +02:00
Laurent Destailleur
c511af69fe
Debug look and feel v12
2020-05-10 21:07:49 +02:00
Laurent Destailleur
796f97c671
Support tag $capture in input of files
2020-05-10 15:08:01 +02:00
Frédéric FRANCE
bd7a2d23a0
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-08 21:29:12 +02:00
Frédéric FRANCE
8f9ee3250d
clean
2020-05-07 23:28:32 +02:00
Frédéric FRANCE
7e7a10f8d2
clean
2020-05-07 22:55:21 +02:00
Laurent Destailleur
206b16410e
Revert the option to avoid to introduce a feature that is duplicate with
...
already existing view "Events/Agenda". It also keeps a common behaviour
between other tools.
Maxi debug on messages of tickets
2020-05-07 22:52:32 +02:00
Frédéric FRANCE
6d5e83ad66
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-07 16:16:10 +02:00
Laurent Destailleur
6c8d302dd9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/list.php
htdocs/compta/prelevement/rejets.php
htdocs/fourn/commande/index.php
2020-05-07 12:03:49 +02:00
Laurent Destailleur
d6887f3ca4
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/prelevement/bons.php
htdocs/compta/prelevement/list.php
htdocs/core/class/notify.class.php
2020-05-07 11:59:13 +02:00
Laurent Destailleur
d4400cf80f
FIX links into emails of notifications
2020-05-07 11:39:32 +02:00
Frédéric FRANCE
574a4d4ce8
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-06 10:54:59 +02:00
atm-quentin
b6aa766c72
FIX stickler
2020-05-06 09:37:17 +02:00
Laurent Destailleur
30fede216c
Fix Add '_pw' var as var sensibles.
2020-05-06 04:03:07 +02:00
Frédéric FRANCE
93cac43306
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-05 18:37:56 +02:00
atm-quentin
1b35380dda
NEW stats invoice graph with 3 bars
2020-05-05 16:13:04 +02:00
Laurent Destailleur
7e6b5a384d
Code comment
2020-05-05 15:16:30 +02:00
Laurent Destailleur
2afd38e2f6
FIX Combo list of available users to filter on the list of leaves.
2020-05-04 21:59:31 +02:00
Laurent Destailleur
6d894b7abd
Fix missing link in message
2020-05-04 19:08:31 +02:00
Laurent Destailleur
4b34a6bd4a
Look and feel
2020-05-04 12:43:47 +02:00
Laurent Destailleur
535ae612f3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-03 22:48:48 +02:00
Laurent Destailleur
4d6a45d491
Major doxygen fix
2020-05-03 22:48:35 +02:00
Marc Guenneugues
b5abb72c5b
Add / as a delimiter for replacement pattern in select_produits*
2020-05-02 16:36:40 +02:00
Laurent Destailleur
48e62eca0c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-02 15:19:09 +02:00
Laurent Destailleur
a88ab40384
Clean phpcs
2020-05-02 15:18:59 +02:00
Frédéric FRANCE
44f914fede
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-02 13:29:56 +02:00
Laurent Destailleur
099871e217
Merge pull request #13649 from atm-john/12.0_add_class_unitstools
...
NEW class tool for converting units
2020-05-02 13:05:51 +02:00
Frédéric FRANCE
39ac031aa9
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-02 06:59:54 +02:00
Marc Guenneugues
fbabfe9a71
Correct typo
2020-05-02 06:53:11 +02:00
Marc Guenneugues
79647b35cd
Enable multiple mass actions on a single page - dev branch
2020-05-02 06:42:12 +02:00
Scrutinizer Auto-Fixer
8f0e00b4aa
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-05-02 01:39:56 +00:00
Laurent Destailleur
aab9a2ff75
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-05-01 21:03:38 +02:00
Laurent Destailleur
b41b22996f
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/class/utils.class.php
htdocs/core/lib/files.lib.php
2020-05-01 21:03:16 +02:00
Laurent Destailleur
385f998254
Fix restore param --quick
2020-05-01 21:01:40 +02:00
Frédéric FRANCE
3c7265e357
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-01 17:12:17 +02:00
Frédéric FRANCE
92898c9562
enable free emails with select2
2020-05-01 11:27:11 +02:00
Frédéric FRANCE
fddbe7c929
$tmpplugin was defined after use
2020-05-01 07:50:46 +02:00
Laurent Destailleur
c27b3c5966
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/tpl/extrafields_list_search_sql.tpl.php
2020-04-30 18:49:20 +02:00
Laurent Destailleur
82ace4b4ef
FIX Several pb in export of documents
...
FIX Must escape shell
FIX Must exclude logs and some dirs for compressed backup
FIX gzip and bzip2 must use option -f
2020-04-30 11:52:30 +02:00
Laurent Destailleur
6ec6a4465a
FIX Setup of thirdparty or contact for external users
2020-04-29 20:21:17 +02:00
Laurent Destailleur
908e5d7f0a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/api/class/api_setup.class.php
2020-04-29 18:05:01 +02:00
Laurent Destailleur
84bca036c9
FIX Link missing into email of some notification
2020-04-29 18:03:28 +02:00
Laurent Destailleur
a0c013d87b
Fix missing link
...
Conflicts:
htdocs/core/class/notify.class.php
2020-04-28 19:18:31 +02:00
Laurent Destailleur
c22e13b138
FIX Avoid infinite loop when a fetch is inside a compute field.
2020-04-28 14:27:51 +02:00
Laurent Destailleur
a8740352af
FIX Extrafields of type price must be '' and not '0' if not defined
2020-04-28 14:27:42 +02:00
Laurent Destailleur
dd3a5949c0
FIX Avoid infinite loop when a fetch is inside a compute field.
2020-04-28 14:25:07 +02:00
Laurent Destailleur
2b00ae9e92
FIX Extrafields of type price must be '' and not '0' if not defined
2020-04-28 14:22:52 +02:00
kkhelifa-opendsi
908c653743
Merge branch 'develop' into stcommcontact
2020-04-28 09:03:17 +02:00
Laurent Destailleur
0de8cb7096
Add property shortlang
2020-04-27 18:38:11 +02:00
kamel
218fbfc70b
Correction pour validation Stickler CI / stickler-ci
2020-04-27 18:06:50 +02:00
kamel
28d330996c
Correction pour validation Stickler CI / stickler-ci
2020-04-27 18:01:07 +02:00
ATM john
41e597e739
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_add_class_unitstools
2020-04-27 17:46:22 +02:00
kamel
9cb90cb384
NEW: Add prospect status managment for the contact with managment of custom icon
2020-04-27 17:35:14 +02:00
Laurent Destailleur
fe6fb12d18
Fix missing link
2020-04-27 17:13:23 +02:00
Laurent Destailleur
a7de160290
Merge pull request #13740 from simicar29/develop-hook-updateTotalPrice
...
ADD: New hook updateTotalPrice in commonObject update_price
2020-04-27 13:43:13 +02:00
Laurent Destailleur
4c605283f5
Fix phpcs
2020-04-27 00:09:21 +02:00
Laurent Destailleur
31157931a9
Fix phpcs
2020-04-26 23:52:23 +02:00
Laurent Destailleur
31ba277da7
Fix phpcs
2020-04-26 23:18:09 +02:00
Laurent Destailleur
b20d85b198
Fix phpcs
2020-04-26 23:06:52 +02:00
Laurent Destailleur
6caa872280
Enable more PHPCS rules
2020-04-25 19:27:42 +02:00
Laurent Destailleur
068a890c36
Enable more PHPCS rules
2020-04-25 19:13:20 +02:00
Laurent Destailleur
3090eb578b
Look and feel v12
2020-04-25 17:43:12 +02:00
Laurent Destailleur
0aec776d82
Merge pull request #13737 from lecoqlibre/develop
...
FIX CUnit->fetch id/rowid
2020-04-25 13:53:16 +02:00
Scrutinizer Auto-Fixer
1bf5745286
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-25 11:52:07 +00:00
Marc Guenneugues
fb2759eaf6
Correct lint errors
2020-04-25 10:32:35 +02:00
Marc Guenneugues
966fedc501
ADD: New hook updateTotalPrice in commonObject update_price
2020-04-25 10:19:09 +02:00
Laurent Destailleur
d416edab1a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-24 22:50:09 +02:00
Laurent Destailleur
54d641020f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/accounting-files.php
2020-04-24 22:49:59 +02:00
Maxime Lecoq
9ed7ff80a1
FIX CUnit->fetch id/rowid
2020-04-24 21:08:47 +02:00
Laurent Destailleur
d11dcc35c3
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
2020-04-24 19:56:19 +02:00
Laurent Destailleur
df10b86d1f
FIX consistency of price w/wo vat wrong when price entered with tax
2020-04-24 19:52:34 +02:00
Laurent Destailleur
708f89c9dc
Merge pull request #13732 from pstructures/new-devlelop
...
Fixed Translation Issue Default Contact Address For Field
2020-04-24 19:00:04 +02:00
stickler-ci
6d4d638ec1
Fixing style errors.
2020-04-24 12:38:46 +00:00
Tobias Sekan
05bb94cd3f
fix wrong set e-mail for vCard + docu update
2020-04-24 14:12:43 +02:00
Matt Sidnell
dd070cc680
Update commonobject.class.php
2020-04-23 20:37:15 +01:00
Scrutinizer Auto-Fixer
548f3007cf
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-23 16:55:10 +00:00
florian HENRY
32385b75e1
travis
2020-04-23 16:18:31 +02:00
florian HENRY
7a206df96f
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2020-04-23 16:04:58 +02:00
Laurent Destailleur
68e9d8463a
Debug MAIN_USE_ALTERNATE_TRANSLATION_FOR variable
2020-04-23 15:52:15 +02:00
florian HENRY
882b39628f
fix: uniformize extrafeild replacemnt for ODT docs
2020-04-23 15:50:42 +02:00
Laurent Destailleur
86928efb95
Var not defined
2020-04-23 13:35:40 +02:00
Laurent Destailleur
72c6ac1c72
Complete #13708 , normalization of code
2020-04-23 13:21:39 +02:00
ATM john
bf592489c0
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_add_class_unitstools
2020-04-22 23:09:10 +02:00
Laurent Destailleur
ead78ae777
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-22 21:29:44 +02:00
Laurent Destailleur
de90f24bd4
Fix phpcs
2020-04-22 21:29:15 +02:00
Laurent Destailleur
39c454d07b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modFournisseur.class.php
2020-04-22 18:28:52 +02:00
Laurent Destailleur
6b8ff56c20
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/html.formother.class.php
2020-04-22 18:26:26 +02:00
Laurent Destailleur
496d8f354f
Look and feel v12
2020-04-22 17:59:54 +02:00
gauthier
43f4c5ac96
FIX : model export list must be sorted by label
2020-04-22 15:29:54 +02:00
Laurent Destailleur
2541d41809
Merge pull request #13669 from pstructures/new-devlelop
...
Add default values to extrafields
2020-04-22 01:06:04 +02:00
Laurent Destailleur
770fca0b33
Debug the double language feature in pdf
2020-04-21 20:16:36 +02:00
Laurent Destailleur
042fb4641f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/de_DE/install.lang
htdocs/langs/de_DE/main.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/cashdesk.lang
htdocs/langs/fr_FR/errors.lang
htdocs/langs/fr_FR/projects.lang
2020-04-21 18:33:11 +02:00
Laurent Destailleur
7b99ebfca5
Debug generic translation of fields
2020-04-21 14:54:30 +02:00
Laurent Destailleur
ff5bf040e8
FIX text version of html emailing (removed the body style)
2020-04-21 11:19:27 +02:00
mattsidnell
9040c9680d
Removed whitespace
2020-04-20 23:44:23 +01:00
mattsidnell
3f42bfb40f
change
2020-04-20 23:42:12 +01:00
Matt Sidnell
59b574742b
Update commonobject.class.php
2020-04-20 22:52:36 +01:00
Matt Sidnell
ea9f0097a2
Add default values for Create
...
Added default extrafield values for html and text fields to prepopulate data on record create only.
2020-04-20 22:42:13 +01:00
Frédéric FRANCE
9697085f12
remove debug
2020-04-20 15:36:08 +02:00
Laurent Destailleur
8d59ce2e03
Look and feel v12
2020-04-20 02:48:05 +02:00
Laurent Destailleur
fa056e59df
Look and feel v12
2020-04-20 02:14:43 +02:00
Laurent Destailleur
7b68d4260c
Fix permission on button
2020-04-19 15:50:32 +02:00
Laurent Destailleur
ae80b09327
Merge pull request #13598 from atm-maxime/new_fields_on_group
...
New : refactor UserGroup module with new common way
2020-04-18 16:26:58 +02:00
ATM john
f2435f6247
Move methods to cunits class
2020-04-18 16:08:26 +02:00
Laurent Destailleur
5c18404083
Move to jquery 4.0.13 with fix in reponsive
...
Restore some files modified by error.
2020-04-18 15:15:35 +02:00
Laurent Destailleur
8f7c3fc867
Fix: restore jselect2 4.0.5 (4.0.6 create troubles in responsive)
2020-04-18 14:39:02 +02:00
ATM john
09591d75f6
Sql write less do more...
2020-04-18 13:20:08 +02:00
ATM john
e915552ae1
New class tool for converting units
2020-04-18 13:12:11 +02:00
Laurent Destailleur
f23266e560
css
2020-04-18 11:40:26 +02:00
Laurent Destailleur
7c6c600225
CSS
2020-04-18 11:38:24 +02:00
Laurent Destailleur
965bdf733d
FIX Can overwrite file if exists in file manager
2020-04-17 13:10:18 +02:00
Laurent Destailleur
024abe8b58
FIX Preview of svg files into file manager
2020-04-17 12:34:35 +02:00
Laurent Destailleur
162cd94138
FIX Keep sort order after deletion of a file into file manager.
2020-04-17 12:32:05 +02:00
Laurent Destailleur
1d0b532437
Fix css
2020-04-16 14:31:30 +02:00
Laurent Destailleur
a13215217e
Merge pull request #13604 from TobiasSekan/FixAtomFeeds
...
FIX not working ATOM feeds
2020-04-16 11:58:49 +02:00
Sekan, Tobias
84f7fe24fe
Adress feedback
2020-04-16 10:49:39 +02:00
Laurent Destailleur
f7803247ab
Merge pull request #13610 from joseplluis/patch-6
...
NEW bank account tags for invoice ODT template
2020-04-16 00:49:17 +02:00
Scrutinizer Auto-Fixer
d021559b16
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-15 22:42:57 +00:00
Laurent Destailleur
95cf8b6359
FIX Non expected switch from tab timesptent to tab tasks
2020-04-15 14:54:54 +02:00
Laurent Destailleur
e26124bf84
Clean code to make option TICKET_NOTIFICATION_EMAIL_TO easier to
...
understand
2020-04-15 12:57:33 +02:00
Maxime Kohlhaas
7fea2bc557
Update changelog + trigger name change for class UserGroup
2020-04-15 08:44:29 +02:00
stickler-ci
c047cd1608
Fixing style errors.
2020-04-14 20:55:58 +00:00
Josep Lluís
d41cb023eb
NEW bank account tags for invoice ODT template
...
added tags object_bank_iban and object_bank_bic, useful for ODT invoices when a bank account is assigned
2020-04-14 22:47:40 +02:00
Sekan, Tobias
3482d24ee7
Fix not working ATOM feeds
2020-04-14 10:45:52 +02:00
Maxime Kohlhaas
261e6cbc52
Fix delete extrafield test
2020-04-13 19:08:03 +02:00
Maxime Kohlhaas
2e004e93ea
Commonobject : delete extrafields + syslog
2020-04-13 19:02:19 +02:00
Laurent Destailleur
76fd1fb105
FIX #12996
2020-04-13 16:13:02 +02:00
Laurent Destailleur
3740d59848
Look and feel v12
2020-04-13 04:14:28 +02:00
Laurent Destailleur
596ba8d679
Clean deprecated code.
2020-04-13 01:10:35 +02:00
Laurent Destailleur
5b8864b46e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
2020-04-12 21:41:40 +02:00
Laurent Destailleur
46ccd61009
Fix phpcs
2020-04-12 21:38:23 +02:00
Laurent Destailleur
422e33a68b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/ihm.php
htdocs/comm/action/class/actioncomm.class.php
htdocs/compta/stats/cabyprodserv.php
htdocs/filefunc.inc.php
htdocs/takepos/invoice.php
2020-04-12 17:01:44 +02:00
Laurent Destailleur
697043bbd3
Update html.form.class.php
2020-04-12 16:47:56 +02:00
Laurent Destailleur
acab0200a6
Update html.form.class.php
2020-04-12 16:46:21 +02:00
Laurent Destailleur
7d430c08d0
Look and feel v12
2020-04-12 16:36:25 +02:00
Sekan, Tobias
ab870dd532
Switch to new category API in project list view
2020-04-12 13:30:02 +02:00
Laurent Destailleur
6b16a3ad39
NEW Can check all events in one click in setup of audited events
2020-04-12 13:25:19 +02:00
TuxGasy
fecfe2e3a1
Keep compatibility with old object declaration
2020-04-11 18:37:06 +02:00
Laurent Destailleur
ca8e1f3ea5
NEW Can replace a string into all pages in website module
2020-04-11 18:18:53 +02:00
Laurent Destailleur
33a5288125
Add log
2020-04-11 16:34:59 +02:00
andreubisquerra
bcbd7632bf
Fix travis
2020-04-10 19:49:59 +02:00
jove@bisquerra.com
66659f0693
Two diferents order printers
2020-04-10 19:18:42 +02:00
Scrutinizer Auto-Fixer
444c293c01
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-10 08:59:32 +00:00
Laurent Destailleur
83af4ebea4
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
htdocs/product/stock/class/entrepot.class.php
htdocs/product/stock/list.php
2020-04-10 01:22:22 +02:00
Laurent Destailleur
09f1536c27
Merge pull request #13537 from andreubisquerra/master
...
Add langs and print only no printed order lines
2020-04-09 19:38:30 +02:00
Laurent Destailleur
3c9ca3860b
Merge pull request #13543 from atm-lena/11.0_FIX_hookmanager_typeAddReplace_completeTabsHead
...
FIX - Add function "completeTabsHead" to "addreplace" type hook.
2020-04-09 19:37:48 +02:00
Laurent Destailleur
6a60678186
Look and feel v12
2020-04-09 16:36:39 +02:00
atm-lena
c9ab61b521
FIX - Add function "completeTabsHead" to hooks "addreplace"
2020-04-09 14:54:47 +02:00
jove@bisquerra.com
ea79c91482
Add langs and print only no printed order lines
2020-04-08 20:02:54 +02:00
stickler-ci
e402e35d96
Fixing style errors.
2020-04-08 14:09:04 +00:00
simicar29
6cb780d125
Avoid the doubledot issue in quoted-printable mail
...
When sending HTML mail using swiftmailer, the content will be encoded using quoted-printable. We may then encounter the "double dot" issue (doubled dot at the beginning of the line). This can be problematic with broken links to pictures for example.
This PR switches the encoding to base64.
2020-04-08 16:03:41 +02:00
Laurent Destailleur
3a024124e8
Merge pull request #13525 from TobiasSekan/ConfirmDeleteOnFactureCard
...
NEW Confirm file delete on fracture card
2020-04-08 14:53:19 +02:00
Laurent Destailleur
711f54846b
Merge pull request #13514 from andreubisquerra/develop
...
NEW RECEIPT_PRINTER_NB_CHARACT_BY_LINE and FIX product label
2020-04-08 14:49:16 +02:00
Tobias Sekan
91483fd560
Add optional remove action for showDocuments
2020-04-08 10:24:32 +02:00
Norbert Penel
a5f39e996d
FIX : twice call in a page
...
fix to let this function be used twice in a page
2020-04-07 09:27:55 +02:00
andreubisquerra
5707bf0d73
NEW RECEIPT_PRINTER_NB_CHARACT_BY_LINE and FIX product label
2020-04-06 19:38:50 +02:00
Laurent Destailleur
41b2ed8f89
Look and feel v12
2020-04-06 12:03:37 +02:00
Laurent Destailleur
81f289619d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-05 15:47:46 +02:00
Laurent Destailleur
ed4aa55857
Doxygen
2020-04-05 15:46:10 +02:00
Laurent Destailleur
233a7f1022
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-05 12:24:27 +02:00
Laurent Destailleur
bfbc9b303a
Fix phpcs
2020-04-05 12:23:16 +02:00
Laurent Destailleur
b1c5490a74
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/tpl/extrafields_add.tpl.php
htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
2020-04-05 04:03:53 +02:00
Laurent Destailleur
165df931f1
Complete fix #13491
2020-04-05 03:14:12 +02:00
Laurent Destailleur
22a8c207f4
Merge pull request #13491 from atm-lena/11.0_FIX_Ticket_ExtrafieldsVisibility_4
...
FIX 11.0 Ticket - Visibility 4, don't display extrafields at the creation
2020-04-05 02:54:41 +02:00
Laurent Destailleur
a41f54c82f
Fix css
2020-04-05 02:39:40 +02:00
Laurent Destailleur
647d09050b
Clean not required vars
2020-04-04 19:25:36 +02:00
atm-lena
bc0d98b91c
FIX 11.0 Ticket Module - Visibility 4, don't display extrafields at the creation
2020-04-03 14:24:59 +02:00
Laurent Destailleur
87d46c4e86
Merge pull request #13473 from nervo/patch-1
...
NEW [Allow constants values to be overridden by environment variables]
2020-04-02 13:33:47 +02:00
Laurent Destailleur
9f55918cb8
Remove Geoipv1 library. We use now v2
2020-04-02 12:37:21 +02:00
Laurent Destailleur
84cda962c1
Clean dead code
2020-04-02 12:03:29 +02:00
Laurent Destailleur
f6b216eafc
Fix travis
2020-04-01 23:32:44 +02:00
Laurent Destailleur
6aea67a5b9
Work on extralanguages
2020-04-01 23:15:53 +02:00
stickler-ci
cf3615aee3
Fixing style errors.
2020-04-01 20:11:18 +00:00
nervo
abd6465190
Allow constants values to be overridden by environment variables
2020-04-01 22:02:34 +02:00
Laurent Destailleur
d2de6a22eb
WIP Can set values in extra languages
2020-04-01 18:11:28 +02:00
Laurent Destailleur
33d2b61c19
Work on extralanguages
2020-04-01 16:21:03 +02:00
Laurent Destailleur
e75e49426f
Look and feel v12
2020-03-31 13:52:02 +02:00
Laurent Destailleur
0b7b97ec34
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-30 19:43:03 +02:00
Laurent Destailleur
efaea37d61
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
2020-03-30 19:42:53 +02:00
Laurent Destailleur
4220236aa8
Merge pull request #13425 from andreubisquerra/develop
...
NEW: CUPS printing compatibility for TakePOS
2020-03-30 18:56:14 +02:00
oscim
d760b6618d
Fix use correctly hosts in connection
...
cf https://github.com/Dolibarr/dolibarr/issues/9426
2020-03-30 18:27:18 +02:00
Nicolas Bouquet
31fca2897a
FIX: extra date field incorrect check
...
Small typo fixed, was preventing extra date fields from being processed, leading to denial of object creation
2020-03-30 10:24:42 +02:00
Laurent Destailleur
4ed4644c08
Work on generic multilanguage properties
2020-03-29 04:28:23 +02:00
Laurent Destailleur
d5b107211f
Look and feel v12
2020-03-28 15:20:26 +01:00
Laurent Destailleur
ec83f18944
Move more icon definition into CSS
2020-03-28 13:38:25 +01:00
Laurent Destailleur
c27592bad2
Clean deprecated params on all fetch_optionals()
2020-03-27 16:02:58 +01:00
Laurent Destailleur
9379f6fa9d
Fix duplicate tooltip
2020-03-26 20:27:49 +01:00
Laurent Destailleur
a02e3e1e61
Fix duplicate tooltip
2020-03-26 20:05:17 +01:00
Laurent Destailleur
4a012c13b2
FIX Translation of tooltips of extrafields
2020-03-26 19:47:28 +01:00
Laurent Destailleur
2f94db6ffe
FIX Translation of tooltips of extrafields
2020-03-26 19:46:36 +01:00
Laurent Destailleur
5a5863f46a
FIX Group by invalid with pgsql
2020-03-26 03:55:34 +01:00
Laurent Destailleur
fa3bba942f
Start to save the VAT src code into table of discounts to reuse them
...
later
2020-03-26 02:01:30 +01:00
Laurent Destailleur
ab19bb2455
FIX default value of selectMasssAction broken
2020-03-26 01:25:05 +01:00
Laurent Destailleur
90e0ead953
FIX default value of selectMasssAction broken
2020-03-26 00:52:05 +01:00
Laurent Destailleur
20fad86520
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/cashcontrol/cashcontrol_card.php
2020-03-26 00:14:06 +01:00
andreubisquerra
eef3a1795e
Update dolreceiptprinter.class.php with CUPS
2020-03-25 21:30:33 +01:00
Laurent Destailleur
51f8c5ca87
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/commoninvoice.class.php
htdocs/expensereport/list.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/product/fournisseurs.php
2020-03-25 19:01:56 +01:00
Laurent Destailleur
7c819a96d5
Merge pull request #13415 from ptibogxiv/patch-314
...
NEW PRODUCT_SHOW_ORIGIN_IN_COMBO
2020-03-25 18:32:57 +01:00
Laurent Destailleur
0a92dcc5e6
Merge pull request #13413 from atm-florian/develop
...
fix extrafield creation with empty printable
2020-03-25 18:31:28 +01:00
Laurent Destailleur
925554d15e
More accurate result
2020-03-25 18:27:53 +01:00
Laurent Destailleur
3855ef6073
Add rounding code 'CR' (currency rate'
2020-03-25 17:41:39 +01:00
VESSILLER
c516a54f78
FIX get remain to pay with rounding decimals
2020-03-25 11:53:47 +01:00
ptibogxiv
06f53fdd69
Update html.form.class.php
2020-03-24 17:32:50 +01:00
ptibogxiv
8409f3ba4e
NEW PRODUCT_SHOW_ORIGIN_IN_COMBO
...
for some business, products have same label so we sometimes need display origin of product for a good choice
2020-03-24 17:28:12 +01:00
florian HENRY
21febcc8fc
fix extrafeild creation
2020-03-24 16:09:18 +01:00
Scrutinizer Auto-Fixer
e8083e2a65
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-23 14:54:02 +00:00
Laurent Destailleur
94b6fbb223
FIX #13300
2020-03-22 20:52:00 +01:00
Laurent Destailleur
26e9500c26
FIX #13300
2020-03-22 20:50:50 +01:00
Laurent Destailleur
6f3cbe69e8
Fix phpcs
2020-03-22 19:40:58 +01:00
Laurent Destailleur
700e384639
WIP Edit fields into alternate language
2020-03-22 19:11:21 +01:00
Laurent Destailleur
0574e1df9f
Merge pull request #13386 from aspangaro/12.0_a24
...
FIX: Load the translation file for extrafields
2020-03-20 10:05:41 +01:00
Laurent Destailleur
5ffc57f3f0
Update extrafields.class.php
2020-03-20 10:05:08 +01:00
Laurent Destailleur
03b261d54c
Provide information of thirdparty, contact or project to SMS handler
2020-03-19 19:11:34 +01:00
Alexandre SPANGARO
a6227aeb6a
FIX: Load the translation file for extrafields
2020-03-19 11:53:42 +01:00
Laurent Destailleur
fca6d45baa
NEW Overwrite tpl with module_part['tpl'] is deprecated. USe hooks
...
instead.
2020-03-19 10:15:34 +01:00
Laurent Destailleur
c94c33696a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-19 09:58:04 +01:00
Laurent Destailleur
d38c6616e6
Doc
2020-03-19 09:53:20 +01:00
Laurent Destailleur
21de447d9e
Merge pull request #13349 from TobiasSekan/AddSubstitutForUserCivility
...
NEW "contact_civility" for ODT templates
2020-03-18 19:31:10 +01:00
Laurent Destailleur
2c3bd78095
Merge pull request #13353 from FHenry/dev_addHookOnSelectUserORSalesRep
...
new : Add hook on select user or sales rep
2020-03-18 18:56:56 +01:00
Laurent Destailleur
3b1c02ae46
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-18 18:51:05 +01:00
Laurent Destailleur
8bab245c7e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/tpl/contacts.tpl.php
2020-03-18 18:50:55 +01:00
Laurent Destailleur
e639e24993
Merge pull request #13352 from aspangaro/12.0_a22
...
FIX Update fiscalyear.class.php to filter on entity
2020-03-18 18:19:02 +01:00
Laurent Destailleur
94750ed350
css
2020-03-17 01:31:48 +01:00
Alexandre SPANGARO
6b168428d8
Merge remote-tracking branch 'upstream/develop' into 12.0_a22
2020-03-16 12:11:01 +01:00
florian HENRY
ef83801a53
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_addHookOnSelectUserORSalesRep
2020-03-16 11:53:49 +01:00
florian HENRY
117ff5f4eb
add hook to add sql filter in where clause on select users
2020-03-16 11:49:03 +01:00
Alexandre SPANGARO
301b97f6d2
FIX Update fiscalyear.class.php to filter on entity
2020-03-16 10:05:22 +01:00
Tobias Sekan
c50f2b32d8
Add substitution for "user_civility" for ODT
2020-03-16 07:58:44 +01:00
Laurent Destailleur
22e8fdb46b
Enhance #13033
2020-03-15 13:57:31 +01:00
Laurent Destailleur
37fce0d3ee
Fix position on merou
...
Fix preselected value on contact
2020-03-14 14:45:37 +01:00
Laurent Destailleur
0d2d2302d5
Removed not relevant graph on stats on project
2020-03-14 03:18:49 +01:00
Laurent Destailleur
3b72005f93
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/card.php
htdocs/filefunc.inc.php
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/cashdesk.lang
htdocs/langs/fr_FR/errors.lang
htdocs/langs/fr_FR/products.lang
htdocs/langs/fr_FR/projects.lang
2020-03-14 00:22:11 +01:00
Laurent Destailleur
99669583d5
Fix phpcs
2020-03-13 16:46:07 +01:00
Laurent Destailleur
d90bf25351
Fix phpcs
2020-03-13 13:11:04 +01:00
Laurent Destailleur
893ae21d3a
Fix phpcs
2020-03-13 11:29:27 +01:00
Laurent Destailleur
6dda972ff5
Doxygen
2020-03-13 04:12:42 +01:00
Laurent Destailleur
94589158c0
Move class from external project as internal class (project is dead)
2020-03-13 02:32:33 +01:00
Laurent Destailleur
967d4223c6
FIX #13277
2020-03-12 16:15:48 +01:00
simicar29
4f4b778c8c
update_price: add invoice_supplier element name
...
'invoice_supplier' as an element name was missing in test conditions to skip the update_price function
2020-03-12 12:53:17 +01:00
stickler-ci
aaf1081f17
Fixing style errors.
2020-03-12 11:46:41 +00:00
Scrutinizer Auto-Fixer
f413ce6aac
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-12 11:45:44 +00:00
Laurent Destailleur
c1e5178eeb
Doc
2020-03-12 12:01:40 +01:00
Laurent Destailleur
d6a35db754
Look and feel v12
2020-03-12 11:13:50 +01:00
Laurent Destailleur
61cb1ec81a
Merge pull request #13185 from atm-john/12.0_new_allow_extrafields_on_pdf_extend_to_line_desc
...
NEW : Allow extrafields on pdf : extend to line desc
2020-03-11 17:12:14 +01:00
Laurent Destailleur
21dbddac76
Merge pull request #13317 from TobiasSekan/FixErrorOnAddLineToOrder
...
FIX Error on add a new line to a supplier order (with ODT templates)
2020-03-11 16:58:44 +01:00
Laurent Destailleur
2b8a06cb5e
FIX unit price for selected supplier products not set. NaN was used.
2020-03-11 16:12:34 +01:00
Laurent Destailleur
5adec1fe32
FIX unit price for selected supplier products not set. NaN was used.
2020-03-11 16:11:38 +01:00
Laurent Destailleur
1f5c8f682c
FIX cols parameter not propagated to tpl
2020-03-10 21:55:29 +01:00
Laurent Destailleur
d956222e36
FIX cols parameter not propagated to tpl
2020-03-10 21:54:50 +01:00
Tobias Sekan
60944c92a8
Fix error on add a line to a supplier order
2020-03-10 09:02:38 +01:00
Laurent Destailleur
cc1a02f0ea
Support of null values in graph
2020-03-09 22:52:30 +01:00
Laurent Destailleur
e1c7222172
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-09 20:39:05 +01:00
Laurent Destailleur
86f6736a18
Fix phpcs
2020-03-09 18:55:47 +01:00
Laurent Destailleur
ca4c62be56
Fix var init
2020-03-09 13:56:25 +01:00
Laurent Destailleur
067759bf04
Fix graph for lines
2020-03-08 20:22:46 +01:00
Laurent Destailleur
343a80fd3d
Fix table fields
2020-03-08 19:25:00 +01:00
Laurent Destailleur
6424e50ba4
Enhance of colors in graph
2020-03-07 16:45:28 +01:00
Laurent Destailleur
e6f68b9a29
Fix correct 'group by' when content is '0', '' or null
2020-03-06 20:02:05 +01:00
Jean Traullé
7c2bed2846
Fix #13296
2020-03-06 16:22:41 +00:00
Laurent Destailleur
d812249047
Move code into functions
2020-03-06 17:13:51 +01:00
Laurent Destailleur
cdec58a527
Clean old code
2020-03-06 15:05:18 +01:00
Laurent Destailleur
d0f22c7bff
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/boxes/box_graph_product_distribution.php
2020-03-06 14:22:42 +01:00
Laurent Destailleur
d4b67a6cef
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/contrat/list.php
htdocs/core/lib/functions.lib.php
2020-03-06 14:19:30 +01:00
Laurent Destailleur
0b8adbfc55
Merge pull request #13289 from atm-greg/Fix_countable_warning_on_homescreen
...
fix countable warning on home screen
2020-03-06 14:13:24 +01:00
Laurent Destailleur
ad9d0a3472
Fix graph of product distribution when too much record
2020-03-06 12:45:02 +01:00
Laurent Destailleur
e2396919d4
FIX chart of product distribution
2020-03-06 11:52:32 +01:00
atm-greg
eafff58a54
fix countable warning
2020-03-06 11:30:45 +01:00
Laurent Destailleur
c27f90958e
Code comment
2020-03-06 11:06:07 +01:00
Laurent Destailleur
4c6a4ade5b
Log
2020-03-06 11:02:40 +01:00
Laurent Destailleur
ea658ebe72
Fix setShowLegend with chartjs
2020-03-06 09:51:30 +01:00
Laurent Destailleur
f9546fc50e
Fix dolgraph
2020-03-06 09:21:04 +01:00
Laurent Destailleur
32ee3122ac
More accurate code
2020-03-06 02:24:24 +01:00
Laurent Destailleur
0ba2c53b02
Fix translation of graph
2020-03-06 01:42:42 +01:00
Laurent Destailleur
7b5f9e1b11
Fix graph
2020-03-06 01:29:59 +01:00
Laurent Destailleur
52c236570b
Work on the generic Graphic Reporting tool
2020-03-06 01:18:35 +01:00
Laurent Destailleur
0bd2740779
NEW Can force position of legend of graph on right (instead of top)
2020-03-05 17:23:19 +01:00
Laurent Destailleur
ddb26d7a8f
NEW Add graph type 'piesemicircle'
2020-03-05 16:30:55 +01:00
kamel
0123fa7696
FIX subsitute lines dates values on doc generator (ODT, ...)
2020-03-05 15:37:01 +01:00
Laurent Destailleur
fc31680bd0
Several fix for chart.js graphs
2020-03-05 02:55:06 +01:00
Laurent Destailleur
74fa8d90e7
Use status of member colors into pie chart
2020-03-05 01:38:41 +01:00
Laurent Destailleur
a98b65ad99
FIX #13274 cannot add or update 0 value for an int or double extrafield
...
type
2020-03-05 00:43:51 +01:00
Laurent Destailleur
aa1552dbc0
Enhance graphs
2020-03-05 00:17:16 +01:00
Laurent Destailleur
d0839350db
NEW Move engine to build charts from jflot to chart.js
2020-03-04 23:30:41 +01:00
Laurent Destailleur
2b6aaa652d
Merge pull request #13256 from ATM-Marc/NEW_list_multicurrency
...
NEW: add multicurrency columns to document lists
2020-03-03 23:12:53 +01:00
Laurent Destailleur
760afd6838
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-02 23:28:12 +01:00
Laurent Destailleur
481ea6296e
No more need fo this constant. Use the generic default feature instead
2020-03-02 23:28:01 +01:00
Laurent Destailleur
55093f9ff2
Merge pull request #13232 from TobiasSekan/NewCategoriesInStocks
...
NEW Category filter for warehouse list
2020-03-02 22:50:08 +01:00
Laurent Destailleur
6d01aee2f2
Merge pull request #13246 from Dolibarr/11.0
...
Can process lang files with windows format (even if all lang files must have linux format)
2020-03-02 21:46:27 +01:00
Sekan, Tobias
f325c63055
Merge branch 'NewCategoriesInStocks' of https://github.com/TobiasSekan/dolibarr into NewCategoriesInStocks
2020-03-01 14:50:27 +01:00
Sekan, Tobias
754058b990
Fix lint errors
2020-03-01 14:50:22 +01:00
stickler-ci
a6b2531fd0
Fixing style errors.
2020-03-01 13:46:49 +00:00
Sekan, Tobias
0e55495c3e
adress feedback
2020-03-01 14:45:51 +01:00
Laurent Destailleur
bb5b55f9e3
Merge pull request #13225 from prietojc/patch-13
...
Update translate.class.php
2020-02-29 12:58:32 +01:00
Laurent Destailleur
00483e4e85
NEW Add hook getInputIdProf. Better solution for #13228
2020-02-29 12:32:27 +01:00
Laurent Destailleur
dea8525a6c
NEW X-Axis on graph are show vertical when there is a lot of values.
2020-02-29 01:26:24 +01:00
Laurent Destailleur
f0d458682d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-29 00:15:17 +01:00
Laurent Destailleur
e35bba358f
Fix error when generating documents
2020-02-29 00:13:42 +01:00
Laurent Destailleur
bfb9739ae8
Fix manufacuring efficiency on bom lines.
2020-02-28 16:12:42 +01:00
Laurent Destailleur
e07a29ecd0
Fix class not found
2020-02-27 22:02:45 +01:00
Laurent Destailleur
2d841d9d83
Debug multilang website
2020-02-27 21:43:11 +01:00
Laurent Destailleur
a3e56994b6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/admin/company.php
htdocs/compta/tva/document.php
htdocs/core/lib/files.lib.php
htdocs/main.inc.php
2020-02-27 18:35:32 +01:00
Laurent Destailleur
baaa6b797b
FIX SQl syntax error
2020-02-27 17:51:31 +01:00
Laurent Destailleur
a0b465e8ae
Fix sql error
2020-02-27 17:43:59 +01:00
Laurent Destailleur
eac07aceb0
Responsive
2020-02-27 16:00:01 +01:00
Marc de Lima Lucio
6d728f12ba
NEW: invoice list: enable multicurrency columns
2020-02-27 14:10:00 +01:00
JC Prieto
c555a2c588
Update translate.class.php
...
Resolve bug #9105
When load() function loads translation file from an external modules, adds a \r simbol at the end of each line.
2020-02-27 09:32:22 +01:00
Laurent Destailleur
9bc5eb44ca
FIX #13182
2020-02-26 20:25:26 +01:00
Laurent Destailleur
0646b1a7a9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/ihm.php
2020-02-26 17:04:14 +01:00
Laurent Destailleur
ab01acfe53
Merge pull request #13211 from ATM-Marc/FIX_11.0_excess_paid_from_situation_invoice
...
FIX: excess paid from situation invoices not counted when calculating remain to pay
2020-02-26 16:30:20 +01:00
Laurent Destailleur
b52cfe58d6
FIX Disable js if no javascript
2020-02-26 15:45:12 +01:00
Laurent Destailleur
35e886fb12
FIX Disable js if no javascript
2020-02-26 15:22:23 +01:00
Marc de Lima Lucio
d3b70994fe
Merge branch 'FIX_8.0_excess_paid_from_situation_invoice' of github.com:ATM-Marc/dolibarr into FIX_11.0_excess_paid_from_situation_invoice
2020-02-26 10:42:55 +01:00
Marc de Lima Lucio
373ab3bc01
FIX: excess paid from situation invoices not counted when calculating remain to pay
2020-02-26 10:35:43 +01:00
Laurent Destailleur
b7b2d3562b
Merge pull request #13195 from oscim/patch-24
...
Update commonobject.class.php
2020-02-26 05:14:27 +01:00
Laurent Destailleur
59137f0f47
Merge pull request #13190 from oscim/patch-23
...
Update commonobject.class.php
2020-02-25 12:05:22 +01:00
ATM john
c216b7cae5
fix title padding definition source
2020-02-24 22:34:34 +01:00
ATM john
7b6faf7063
Merge branch '12.0_new_allow_extrafields_on_pdf_extend_to_line_desc' of github.com:atm-john/dolibarr into 12.0_new_allow_extrafields_on_pdf_extend_to_line_desc
2020-02-24 22:16:10 +01:00
ATM john
9c1fdf1c52
Fix missing php doc
2020-02-24 22:12:36 +01:00
stickler-ci
5a77716b93
Fixing style errors.
2020-02-24 21:10:14 +00:00
ATM john
3e492b8a5b
Fix title padding
2020-02-24 22:08:04 +01:00
ATM john
ae890d021c
Fix comments
2020-02-24 21:50:01 +01:00
ATM john
7f2dd19bb0
Fix pdf cell padding for model cyan, erathosthene, espadon, cornas
2020-02-24 21:43:33 +01:00
stickler-ci
6de74e774e
Fixing style errors.
2020-02-24 19:50:07 +00:00
ATM john
3c4e7f7b07
Fix cell padding sponge
2020-02-24 20:47:19 +01:00
oscim
65f3e5466e
Update commonobject.class.php
...
add path class for support type project or projet in element_element
2020-02-24 17:51:11 +01:00
stickler-ci
d07e2ab8fb
Fixing style errors.
2020-02-24 16:44:46 +00:00
oscim
fe4bd46c43
Update commonobject.class.php
...
add support of contact linkedobject
2020-02-24 17:28:25 +01:00
Tobias Sekan
7baba2ba43
Add line number substitution
2020-02-24 14:55:02 +01:00
John Botella
06b2d459c0
Fix cell padding
2020-02-24 14:18:49 +01:00
oscim
6c7a534018
Update commonobject.class.php
...
Add support of project/projet in objectlinked
2020-02-24 11:49:12 +01:00
ATM john
41c18a7884
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_allow_extrafields_on_pdf_extend_to_line_desc
2020-02-24 00:01:50 +01:00
Laurent Destailleur
096a568e83
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
2020-02-23 23:42:23 +01:00
stickler-ci
fab34d5114
Fixing style errors.
2020-02-23 22:40:41 +00:00
ATM john
0c2d08cdd9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_allow_extrafields_on_pdf_extend_to_line_desc
2020-02-23 23:36:43 +01:00
Laurent Destailleur
ee45c3efb6
FIX #13184
2020-02-23 23:29:13 +01:00
ATM john
acacbfd85e
Fix list separator on first loop
2020-02-23 23:17:10 +01:00
ATM john
316fa4068a
revert commit fdfc45bbe9 and fix y position
2020-02-23 23:14:01 +01:00
ATM john
5ecef88b35
allow in extrafield conf to choose to add extrafield in a new col or append it to description, it could be useful for html or long text extrafields
2020-02-23 23:04:24 +01:00
Laurent Destailleur
ca39c680c7
Rename field documentpdf into printable (this field already exists due
...
to a very old PR nofinished for same goal).
2020-02-23 23:03:17 +01:00
Laurent Destailleur
90565e4637
Merge pull request #13179 from atm-john/12.0_new_allow_extrafields_on_pdf
...
NEW allow display extrafields on pdf
2020-02-23 22:55:16 +01:00
Laurent Destailleur
cac61c223d
Merge pull request #13176 from andreubisquerra/master
...
Add orders to Receipt Printer module
2020-02-23 22:44:14 +01:00
Laurent Destailleur
76e33058a8
NEW Can select several fields to personalize list before submit.
2020-02-23 21:38:24 +01:00
ATM john
f611e4fc0e
Merge branch '12.0_new_allow_extrafields_on_pdf' of github.com:atm-john/dolibarr into 12.0_new_allow_extrafields_on_pdf
2020-02-23 20:53:50 +01:00
ATM john
07bd6e1fc0
Fix On admin page add extrafields form, display on pdf option doesn't saved
2020-02-23 20:52:44 +01:00
stickler-ci
222a000d31
Fixing style errors.
2020-02-23 14:27:22 +00:00
ATM john
8a279ed124
improve extrafields display in notes
2020-02-23 15:24:59 +01:00
ATM john
679e2fd186
Merge branch '12.0_new_allow_extrafields_on_pdf' of github.com:atm-john/dolibarr into 12.0_new_allow_extrafields_on_pdf
2020-02-23 11:36:06 +01:00
ATM john
fe4e00b139
Add new params to extrafields forms to allow extrafields to be displayed on pdf documents
2020-02-23 11:32:38 +01:00
stickler-ci
d575188d80
Fixing style errors.
2020-02-23 09:11:58 +00:00
ATM john
ff6dc735ee
fix extrafield conf cache
2020-02-23 10:09:47 +01:00
stickler-ci
281e059487
Fixing style errors.
2020-02-23 01:28:30 +00:00
ATM john
8c36dd0ad8
add extrafields in notes
2020-02-23 02:26:21 +01:00
stickler-ci
2b027cfebf
Fixing style errors.
2020-02-22 15:45:39 +00:00
ATM john
e209fd2973
Add extrafields on PDF object lines
2020-02-22 16:27:44 +01:00
javierybar
fddcc844ff
Add orders to Receipt Printers module
2020-02-22 11:30:48 +01:00
Scrutinizer Auto-Fixer
e44865d8b5
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-21 16:53:37 +00:00
Laurent Destailleur
55bef402c4
Fix remove a lot of warnings on Eclipse
2020-02-21 17:47:36 +01:00
Laurent Destailleur
7e4af04886
CSS For bookmark dropdown
2020-02-21 17:18:01 +01:00
Laurent Destailleur
be3ecb3093
Remove hidden constant MAIN_EXTRAFIELDS_IN_ONE_TD that was useless
2020-02-21 14:32:53 +01:00
Laurent Destailleur
7909055ee8
Enhance multilangue support in website module
2020-02-21 11:36:16 +01:00
Laurent Destailleur
c29e1e78f3
NEW Bookmarks are now in top menu bar
2020-02-20 15:43:31 +01:00
Laurent Destailleur
ac5e9ce5b3
Fix doc
2020-02-20 01:34:33 +01:00
Laurent Destailleur
5c48f6f405
Lang of web site is optional
2020-02-20 01:08:53 +01:00
Laurent Destailleur
895503d2eb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/index.php
htdocs/core/class/CMailFile.class.php
2020-02-20 00:21:25 +01:00
Laurent Destailleur
1dd5ba093d
Prepare PHP v8 - mktime() and gmmktime() are no more allowed
2020-02-19 12:11:16 +01:00
Laurent Destailleur
ac16857501
GETPOST(..., 'alpha') remove " if found instead of returning ''
2020-02-19 11:33:45 +01:00
Laurent Destailleur
7c07589850
FIX #13124
2020-02-19 03:07:12 +01:00
Laurent Destailleur
016c7ad875
FIX #13135
2020-02-19 01:17:16 +01:00
Scrutinizer Auto-Fixer
fd48877dc6
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-18 22:47:25 +00:00
Laurent Destailleur
a6b0fec90b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/exports/class/export.class.php
2020-02-17 12:35:34 +01:00
Laurent Destailleur
504a67daee
FIX duplicate class name into some log lines
2020-02-17 12:34:00 +01:00
Laurent Destailleur
1904ae0e82
FIX Type of contact for event does not exists and not supported
...
FIX Type of contact not saved when creating a contact
FIX SQL Overload in default contact trigger.
FIX Trigger name PROPAL_SUPPLIER_TRIGGER into PROPOSAL_SUPPLIER_TRIGGER
Conflicts:
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-02-17 12:25:51 +01:00
Laurent Destailleur
549bf076d7
Fix prefix of log
2020-02-17 12:22:52 +01:00
Laurent Destailleur
a02f5cde92
FIX Type of contact for event does not exists and not supported
...
FIX Type of contact not saved when creating a contact
FIX SQL Overload in default contact trigger.
FIX Trigger name PROPAL_SUPPLIER_TRIGGER into PROPOSAL_SUPPLIER_TRIGGER
2020-02-17 12:21:07 +01:00
Laurent Destailleur
20797920d7
Fix phpcs
2020-02-16 19:35:52 +01:00
Laurent Destailleur
f4f3efec62
Fight against $_POST
2020-02-16 19:33:58 +01:00
Laurent Destailleur
dc3a15945d
Add method getKanbanView()
2020-02-16 12:05:00 +01:00
Laurent Destailleur
6c9fb06292
Perf
2020-02-15 10:56:44 +01:00
Scrutinizer Auto-Fixer
011803ac71
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-13 11:36:05 +00:00
Laurent Destailleur
46bccf88d3
Fix var not initialized
2020-02-13 12:33:34 +01:00
Laurent Destailleur
9e165a782f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-13 11:58:23 +01:00
Laurent Destailleur
78d4978d31
FIX #13100
2020-02-13 11:26:11 +01:00
Scrutinizer Auto-Fixer
17010478ba
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-13 09:44:08 +00:00
Laurent Destailleur
4981da235c
Fix phpcs
2020-02-12 22:00:44 +01:00
Laurent Destailleur
4a5467234d
Merge pull request #13074 from simicar29/simicar29-patch-4
...
Show extrafields only when enabled
2020-02-12 18:47:32 +01:00
Laurent Destailleur
4678c7ef7a
Merge pull request #13081 from bb2a/patch-14
...
Constant MAIN_DEFAULT_PAYMENT_TYPE_ID can used to set default value
2020-02-12 18:46:08 +01:00
Laurent Destailleur
74d3912763
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.facture.class.php
2020-02-11 16:52:58 +01:00
Laurent Destailleur
05f0242198
NEW The info_admin() can show text after click on other text
2020-02-11 10:38:09 +01:00
Anthony Berton
6b6355f373
Update html.form.class.php
2020-02-11 09:57:52 +01:00
Laurent Destailleur
5823e2f5ef
add warning
2020-02-10 20:57:55 +01:00
Laurent Destailleur
8604ff99ed
Merge pull request #13068 from andreubisquerra/develop
...
Add time tags to Receipt Printers module
2020-02-10 15:37:37 +01:00
simicar29
8bce409db0
Show extrafields only when enabled
...
Show extrafields only in context where they are enabled (especially in edit mode that uses the showOptionals function).
2020-02-10 13:14:42 +01:00
Laurent Destailleur
ecb1f1f2d7
Responsive
2020-02-10 01:01:22 +01:00
Laurent Destailleur
70c19fedeb
Responsive
2020-02-10 00:47:44 +01:00
Laurent Destailleur
d49943ab37
FIX #13019
2020-02-09 18:38:27 +01:00
Laurent Destailleur
8645fd8946
FIX CVE-2019–17223 FIX #13053
2020-02-09 18:28:57 +01:00
Laurent Destailleur
6badf724cf
FIX Mail smtps truncated if content has a line with single .
...
Conflicts:
htdocs/core/class/CMailFile.class.php
2020-02-09 16:38:19 +01:00
Laurent Destailleur
5c000159c1
FIX Mail smtps truncated if content has a line with single .
2020-02-09 16:36:38 +01:00
Laurent Destailleur
18d332994f
FIX Mail smtps truncated if content has a line with single .
2020-02-09 15:51:43 +01:00
andreubisquerra
37e815183e
Add time tags
2020-02-09 14:06:02 +01:00
Laurent Destailleur
665876ffa4
Merge pull request #13061 from andreubisquerra/develop
...
Add and finish receipt printer tags
2020-02-08 16:19:44 +01:00
pnueda
c083458adf
Update html.formfile.class.php
...
Corrects a bug that adds a second '?' in the url string. When strpos returns 0 as the initial position for '?', it is (mis)taken as FALSE value, and then replaced by a second '?' in the list of get parameters, resulting in something like:
/compta/facture/card.php?facid=397?action=remove_file...
instead of
/compta/facture/card.php?facid=397&action=remove_file...
2020-02-08 16:18:52 +01:00
Laurent Destailleur
c9f7dacda1
Merge pull request #13060 from pnueda/patch-1
...
Update html.formfile.class.php
2020-02-08 16:18:17 +01:00
Laurent Destailleur
ee29c3efdd
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-08 16:02:23 +01:00
Laurent Destailleur
c27260869b
FIX #13046 More complete
2020-02-08 15:59:08 +01:00
Laurent Destailleur
b01e1e7724
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-02-08 15:30:16 +01:00
Laurent Destailleur
4b6276ff92
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2020-02-08 15:28:59 +01:00
Laurent Destailleur
14531bf160
Fix #13046 - Bad parenthesis on test
2020-02-08 15:28:40 +01:00
Laurent Destailleur
3a74c3d7e9
Enhance property ->ismulticompanymanaged to define an object with entity
...
on its parent.
2020-02-08 14:40:30 +01:00
andreubisquerra
1e5940fbf0
Fix travis errors
2020-02-07 19:25:28 +01:00
andreubisquerra
ae06151146
Add and finish receipt printer tags
2020-02-07 18:34:58 +01:00
pnueda
8eb9c10788
Update html.formfile.class.php
...
Corrects a bug that adds a second '?' in the url string. When strpos returns 0 as the initial position for '?', it is (mis)taken as FALSE value, and then replaced by a second '?' in the list of get parameters, resulting in something like:
/compta/facture/card.php?facid=397?action=remove_file...
instead of
/compta/facture/card.php?facid=397&action=remove_file...
2020-02-07 18:01:14 +01:00
Laurent Destailleur
84c1228ad4
FIX Disable ticket status change if ticket close
...
FIX Use ref into label of ticket message
2020-02-07 12:15:15 +01:00
Laurent Destailleur
53e1b80742
FIX Disable ticket status change if ticket close
...
FIX Use ref into label of ticket message
2020-02-07 11:52:55 +01:00
Laurent Destailleur
387db16217
FIX Filenames must not contains non ascii char or we will get non ascii
...
char into the SMTP header.
Conflicts:
htdocs/core/class/CMailFile.class.php
2020-02-06 13:03:10 +01:00
Laurent Destailleur
e14612f569
FIX Filenames must not contains non ascii char or we will get non ascii
...
char into the SMTP header.
Conflicts:
htdocs/core/class/CMailFile.class.php
2020-02-06 13:02:27 +01:00
Laurent Destailleur
13442ef0df
FIX Filenames must not contains non ascii char or we will get non ascii
...
char into the SMTP header.
2020-02-06 13:01:09 +01:00
Laurent Destailleur
05e08b3596
FIX Filenames must not contains non ascii char or we will get non ascii
...
char into the SMTP header.
FIX Do not encode subject if it is full ascii (not required)
2020-02-06 12:58:02 +01:00
Laurent Destailleur
dbb731a656
Merge pull request #12957 from TobiasSekan/AddTempWorkFolder
...
NEW Hidden option MAIN_TEMP_DIR
2020-02-05 20:43:26 +01:00
Laurent Destailleur
4a07740601
Update conf.class.php
2020-02-05 20:42:44 +01:00
Laurent Destailleur
7cc959e316
Update conf.class.php
2020-02-05 20:42:03 +01:00
stickler-ci
1ecef695f8
Fixing style errors.
2020-02-05 19:40:22 +00:00
Laurent Destailleur
3e73e97f24
Update conf.class.php
2020-02-05 20:39:38 +01:00
Laurent Destailleur
98ac0428a5
Update conf.class.php
2020-02-05 20:37:49 +01:00
Laurent Destailleur
fdfc45bbe9
Fix wrapping
2020-02-05 15:04:11 +01:00
andreubisquerra
220f02805d
Update image path after move image directory
...
We need change path after move image in the commit:
de4183ea65 (diff-7af3f43d430a17d6e548d766fbacecc2)
2020-02-05 14:12:29 +01:00
Laurent Destailleur
320dd69923
Merge pull request #13002 from andreubisquerra/develop
...
Update image path after move image directory
2020-02-05 14:10:12 +01:00
Alexandre SPANGARO
d6d3fff9dc
Merge branch 'develop' into 10.0_intracommreport
2020-02-03 21:15:07 +01:00
andreubisquerra
e6dc384ee9
Add bold tags
2020-02-03 19:33:23 +01:00
Laurent Destailleur
97d726733c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/includes/tecnickcom/tcpdf/tcpdf.php
2020-02-03 06:36:43 +01:00
Laurent Destailleur
d8ed62ea33
Fix line_max for BOM
2020-02-03 06:28:51 +01:00
Laurent Destailleur
e5808e3335
FIX #12995
2020-02-03 04:48:17 +01:00
Laurent Destailleur
7c35e9aaa8
FIX #12932
2020-02-03 03:56:30 +01:00
Laurent Destailleur
1dab308e4a
FIX #12932
2020-02-03 03:55:37 +01:00
andreubisquerra
a4c1c00728
Update image path after move image directory
...
We need change path after move image in the commit:
de4183ea65 (diff-7af3f43d430a17d6e548d766fbacecc2)
2020-02-02 21:02:43 +01:00
Laurent Destailleur
2dd1e34c2d
Fix phpcs
2020-01-31 19:01:31 +01:00
Laurent Destailleur
ad6758c4da
Fix bad var
2020-01-31 18:03:45 +01:00
Laurent Destailleur
f752551914
WIP Generic stats page
2020-01-31 14:53:47 +01:00
Laurent Destailleur
51c6540a56
WIP Advanced search
2020-01-30 23:28:50 +01:00
Laurent Destailleur
c0bf89929f
Code comment
2020-01-30 19:14:59 +01:00
Laurent Destailleur
b47e1bd8e8
Fix protection when creating extrafield of type separator
2020-01-30 18:47:41 +01:00
Laurent Destailleur
7b92aaa115
Fix templateResult into templateSelection
2020-01-30 18:45:50 +01:00
Scrutinizer Auto-Fixer
5fda829023
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-30 00:48:28 +00:00
Laurent Destailleur
4b0ca24ca3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-29 23:08:51 +01:00
Laurent Destailleur
7b10c2440b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-29 23:08:42 +01:00
Laurent Destailleur
af61c19ffd
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-01-29 23:06:21 +01:00
Laurent Destailleur
e13f1509b3
Merge pull request #12965 from frederic34/patch-6
...
Update extrafields.class.php
2020-01-29 22:57:01 +01:00
Laurent Destailleur
1e879126cd
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/exports/class/export.class.php
2020-01-29 19:28:06 +01:00
Laurent Destailleur
60f772d285
FIX Pending amount to pay must be zero if invoice close for anticipated
...
payment.
2020-01-29 17:56:09 +01:00
Frédéric FRANCE
dcc8b4b65e
Update extrafields.class.php
2020-01-29 15:35:46 +01:00
Laurent Destailleur
1e13f6fd0f
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/resource/class/dolresource.class.php
htdocs/resource/list.php
2020-01-29 11:44:04 +01:00
altairis
3c3876eb59
FIX : default lang selection when filter
2020-01-29 11:32:24 +01:00
Tobias Sekan
8b3eb35cd1
[NEW] Hidden option MAIN_TEMP_DIR
2020-01-29 10:55:56 +01:00
VESSILLER
7cdd334995
FIX require category class in extrafield
2020-01-28 11:37:23 +01:00
Tobias Sekan
713fb1a290
Fix additional space after card name
2020-01-28 08:55:49 +01:00
Laurent Destailleur
4a5dca4a3d
Fix test
2020-01-26 23:48:40 +01:00
Laurent Destailleur
d6830e0d04
Merge pull request #12818 from glafarge/patch-1
...
New : Add native spellcheck to CKEditor
2020-01-26 23:31:27 +01:00
Laurent Destailleur
fd50074b42
Update doleditor.class.php
2020-01-26 23:31:19 +01:00
Laurent Destailleur
8ff19a2a0f
WIP search component
2020-01-26 22:02:31 +01:00
Laurent Destailleur
30a5ab479f
Can choose text to show when there is no data
2020-01-25 22:43:24 +01:00
Laurent Destailleur
0f2141269a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-01-25 14:43:57 +01:00
Laurent Destailleur
06731bdd59
Fix phpcs
2020-01-25 14:40:16 +01:00
Laurent Destailleur
09f809f347
FIX #12913
2020-01-25 14:03:24 +01:00
Laurent Destailleur
08d8670bb3
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/class/product.class.php
2020-01-24 20:12:27 +01:00
Laurent Destailleur
779cd94b0e
Debug cashfence feature
2020-01-24 15:26:18 +01:00
Laurent Destailleur
540713510e
Fix load of segment prices not required for virtual stock change
...
virtual stock must include production (WIP)
2020-01-23 21:03:15 +01:00
Laurent Destailleur
12b4909c45
Fix load of segment prices not required for virtual stock change
...
virtual stock must include production (WIP)
2020-01-23 20:59:18 +01:00
Laurent Destailleur
27a0858050
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
2020-01-23 17:41:31 +01:00
Laurent Destailleur
b3bbb23dae
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/smtps.class.php
2020-01-23 17:38:14 +01:00
Laurent Destailleur
8030558117
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/class/smtps.class.php
2020-01-23 17:34:40 +01:00
Laurent Destailleur
7ee37ddd3f
FIX Error in log for email sending with smtps was not complete
2020-01-23 17:30:05 +01:00
Laurent Destailleur
57569604b2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-22 14:11:53 +01:00
Laurent Destailleur
d3411a79ef
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-22 14:11:44 +01:00
Laurent Destailleur
4686be34d2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
htdocs/product/class/product.class.php
htdocs/stripe/charge.php
2020-01-22 14:10:46 +01:00
Laurent Destailleur
46df9e59ab
Merge pull request #12888 from andreubisquerra/master
...
Fix escpos DummyConnector
2020-01-22 13:56:43 +01:00
Laurent Destailleur
443e4e2223
Update html.form.class.php
2020-01-22 13:44:42 +01:00
Laurent Destailleur
d94e091951
Can exclude some countries from list
2020-01-21 23:49:04 +01:00
Laurent Destailleur
ff9a2608d8
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
2020-01-21 22:22:16 +01:00
Laurent Destailleur
8f1737952d
Fix search on accounting account when option to padd 0 is on.
2020-01-21 22:20:32 +01:00
Laurent Destailleur
a36b0ea4f5
Fix filter on parent account in list of accounting accounts
2020-01-21 21:36:40 +01:00
John Botella
d6766af35d
Fix dom and missing param
2020-01-21 14:17:53 +01:00
Laurent Destailleur
a9790f355d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-21 11:32:40 +01:00
Laurent Destailleur
4598538b42
Prepare PDF templates to use 2 languages for titles
2020-01-21 01:55:00 +01:00
Laurent Destailleur
d2cf4c55ee
Fix label of status
2020-01-20 23:58:01 +01:00
Laurent Destailleur
92856788a3
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-20 18:39:46 +01:00
Laurent Destailleur
cfc74db5bc
FIX field 'private' on email templates was not managed.
2020-01-20 18:38:53 +01:00
Laurent Destailleur
18f2b09fb1
Debug v11
2020-01-20 12:25:25 +01:00
andreubisquerra
70362e7609
Fix travis
2020-01-19 16:44:33 +01:00
andreubisquerra
d4d0ef1295
Fix escpos DummyConnector
2020-01-19 16:16:59 +01:00
Laurent Destailleur
6fd717539d
Merge pull request #12887 from Dolibarr/scrutinizer-patch-5
...
Scrutinizer Auto-Fixes
2020-01-18 20:21:29 +01:00
Laurent Destailleur
24d439845b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
2020-01-18 20:20:25 +01:00
Laurent Destailleur
d9f7c4aec4
FIX #12838
2020-01-18 19:53:48 +01:00
Scrutinizer Auto-Fixer
8744f6ab7b
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-18 15:17:07 +00:00
Laurent Destailleur
908a012c21
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-16 18:13:46 +01:00
Laurent Destailleur
c556f60c89
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-16 18:13:35 +01:00
Laurent Destailleur
d7423c23de
Doc
2020-01-16 12:34:53 +01:00
Scrutinizer Auto-Fixer
0aa156db78
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-16 01:54:00 +00:00
Laurent Destailleur
2c40e4be94
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-15 20:13:45 +01:00
Norbert Penel
3c2dd7db7c
Fix modulbuilder create forms
...
'fk_product' => array('type' => 'integer:Product:product/class/product.class.php' ...
the input was arriving with a select2 instead of an ajax search
2020-01-15 20:11:34 +01:00
Laurent Destailleur
28d5901da4
Fix error of mysqldump not thrown in some cases
2020-01-15 16:45:13 +01:00
Laurent Destailleur
373420edc0
Merge pull request #12476 from ptibogxiv/patch-280
...
NEW add total of value in product stat
2020-01-15 14:11:01 +01:00
Laurent Destailleur
486bb5cd0b
Removed useless include
2020-01-15 13:24:23 +01:00
Laurent Destailleur
43bf0a79e6
Merge pull request #12770 from guillaumematheron/develop
...
NEW 2 new options when creating an invoice from time spent on a project : by period or by task
2020-01-15 13:23:25 +01:00
Laurent Destailleur
e58c2c5110
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-15 12:26:48 +01:00
Laurent Destailleur
1d3d26e185
Fix phpcs
2020-01-15 12:26:11 +01:00
Laurent Destailleur
03a1897089
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/stocks.lang
2020-01-13 13:44:32 +01:00
Laurent Destailleur
2465d5ab47
Merge pull request #12837 from laudeco/hotfix/replenish_product
...
replenish product
2020-01-13 13:18:28 +01:00
Laurent Destailleur
9c9b73e4d1
Fix translation of \n and \\s into language files.
2020-01-13 13:11:25 +01:00
Laurent Destailleur
ce17f65b08
Merge pull request #12829 from atm-florian/11.0
...
Fix Warning
2020-01-13 11:39:05 +01:00
Laurent De Coninck
66e08103de
change the PHPdoc
2020-01-13 10:43:39 +01:00
Laurent Destailleur
22d4f37e58
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/class/html.form.class.php
2020-01-10 14:31:37 +01:00
Laurent Destailleur
b47db086cb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/inventory/class/inventory.class.php
htdocs/product/inventory/list.php
2020-01-10 14:30:42 +01:00
Laurent Destailleur
d97a59ac4a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
ChangeLog
htdocs/comm/remise.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/product/list.php
htdocs/variants/combinations.php
2020-01-10 14:25:26 +01:00
Laurent Destailleur
c4d62e0ea3
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/product/list.php
2020-01-10 13:51:29 +01:00
Laurent Destailleur
22b6828e09
Merge pull request #12792 from aspangaro/12.0_a5
...
NEW Accountancy - Add possibility to manage an short alternative label for account - Use to simplify accountancy
2020-01-10 00:23:54 +01:00
Laurent Destailleur
286d278125
Merge pull request #12816 from artis-auxilium/fix_massaction_check
...
Fix Check array of action after kooks
2020-01-10 00:16:21 +01:00
Laurent Destailleur
f48c7d2ecf
Fix modulebuilder
2020-01-09 22:31:23 +01:00
Laurent Destailleur
0e58edd896
Fix modulebuilder
2020-01-09 22:27:24 +01:00
florian HENRY
83ada939d5
fix warning
2020-01-09 16:26:30 +01:00
Laurent Destailleur
97f62c68f2
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-08 13:38:03 +01:00
Guillaume Lafarge
d9d70c10b3
Add native spellcheck to CKEditor
...
As the native spell checker is disabled by default, this PR removes the default behaviour and restore it to check for spelling and grammar in wysiwyg editor.
See : https://ckeditor.com/docs/ckeditor4/latest/features/spellcheck.html#native-browser-spell-checker
2020-01-08 10:25:58 +01:00
Dev2a
c9c22fe80b
Fix Style
2020-01-07 22:12:35 +01:00
Dev2a
57c954f2e8
Fix Check array of action after kooks
2020-01-07 21:41:36 +01:00
Dev2a
0214d15c55
Fix Check array of action after kooks
2020-01-07 21:39:20 +01:00
Laurent Destailleur
ec81474694
Fix form confirm for "one column" type.
2020-01-07 20:36:36 +01:00
Laurent Destailleur
57bbac2015
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-06 14:09:46 +01:00
Laurent Destailleur
c02a27ba77
Fix log
2020-01-06 13:25:14 +01:00
Laurent Destailleur
9df85a26b8
Fix var_dump
2020-01-06 03:50:42 +01:00
Guillaume Matheron
ffa88ad11f
Merge remote-tracking branch 'upstream/develop' into develop
2020-01-05 14:51:03 +01:00
Laurent Destailleur
6dcba0f053
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-04 14:27:55 +01:00
Laurent Destailleur
38de69f5a9
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/admin/dict.php
htdocs/comm/action/list.php
htdocs/compta/bank/releve.php
htdocs/compta/salaries/card.php
htdocs/core/actions_addupdatedelete.inc.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/boxes.lang
htdocs/langs/en_US/main.lang
htdocs/product/class/product.class.php
htdocs/product/reassort.php
htdocs/product/stock/product.php
htdocs/projet/element.php
2020-01-04 14:20:25 +01:00
Alexandre SPANGARO
c3518426bd
NEW Accountancy - Add possibility to manage an short alternative label - use to simplify
2020-01-03 22:05:49 +01:00
Guillaume Matheron
e9e0aae1ce
Added option to bill time spent on a task to an existing draft invoice (for instance a recurrent bill)
2020-01-02 14:59:53 +01:00
Guillaume Matheron
4f65f8d095
Fixed bug (missing include) in formmargin.class.php, affecting display of propal
2020-01-02 14:13:26 +01:00
Laurent Destailleur
afd32135f2
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/takepos/invoice.php
2020-01-01 22:37:13 +01:00
Laurent Destailleur
ce7360ced3
Code comment
2020-01-01 18:43:46 +01:00
Laurent Destailleur
bf9f9df50f
Fix var not defined
2020-01-01 13:46:09 +01:00
Laurent Destailleur
d175b34323
Fix log
2020-01-01 13:22:20 +01:00
Laurent Destailleur
821ff375b0
Fix update ref
2020-01-01 13:15:42 +01:00
Laurent Destailleur
6fdb5d8e33
FIX ref
2020-01-01 13:14:00 +01:00
Laurent Destailleur
4c6c8e172f
Merge pull request #12784 from Dolibarr/revert-12751-v10-fix-html-form-margin-class
...
Revert "FIX class Facture undefined in displaying margin information"
2019-12-31 17:33:21 +01:00
Laurent Destailleur
08d0d63a04
FIX #12760 #12763 #12755 #12765 #12751
2019-12-31 17:30:27 +01:00
Laurent Destailleur
5cc0d26eae
Revert "FIX class Facture undefined in displaying margin information"
2019-12-31 17:26:02 +01:00
Laurent Destailleur
0c05d02265
Merge pull request #12777 from jerash/develop
...
add credit notes and deposit to getListOfPayments
2019-12-31 17:15:10 +01:00
stickler-ci
6142e42d83
Fixing style errors.
2019-12-31 16:10:36 +00:00
Laurent Destailleur
5a692cecfb
Code comment
2019-12-31 17:10:36 +01:00
Laurent Destailleur
9774b05f52
Update commoninvoice.class.php
2019-12-31 17:10:03 +01:00
Laurent Destailleur
a369690e16
Update commoninvoice.class.php
2019-12-31 17:07:56 +01:00
stickler-ci
d3ec867df5
Fixing style errors.
2019-12-31 16:07:07 +00:00
Laurent Destailleur
b3373e8ba5
Update commoninvoice.class.php
2019-12-31 17:06:30 +01:00
Laurent Destailleur
c341ad5e8d
Update commoninvoice.class.php
2019-12-31 17:03:00 +01:00
Alexandre SPANGARO
c664a1e42d
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2019-12-31 08:34:37 +01:00
stickler-ci
73e0bca359
Fixing style errors.
2019-12-31 00:13:42 +00:00
jerash
411f20c360
add credit notes and discounts to getListOfPayments
2019-12-31 01:08:25 +01:00
Laurent Destailleur
6e90e81be1
Merge pull request #12751 from OPEN-DSI/v10-fix-html-form-margin-class
...
FIX class Facture undefined in displaying margin information
2019-12-30 22:00:28 +01:00
Marc de Lima Lucio
c8dfc3d9fc
FIX: error 500 when getting margin info for objects other than invoices
2019-12-24 16:09:29 +01:00
VESSILLER
720146c45f
FIX class Facture undefined in displaying margin information
2019-12-23 15:37:12 +01:00
Laurent Destailleur
d5f6ccc7a0
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-12-23 14:40:36 +01:00
Laurent Destailleur
29cacec886
Fix month when using "Now" button addnowlink = 2
2019-12-23 14:39:24 +01:00
Laurent Destailleur
07c1a5717e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/facture_situation.php
htdocs/core/class/html.formother.class.php
2019-12-23 14:16:34 +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
Laurent Destailleur
c6ed605d26
Add missing fk_user in import list
2019-12-23 13:49:13 +01:00
Laurent Destailleur
93cece6a3a
Merge pull request #12738 from mapiolca/patch-16
...
#FIX Error Margin with Situation Invoice
2019-12-23 13:43:18 +01:00
Laurent Destailleur
a92db7db39
Look and feel v11
2019-12-23 13:02:30 +01:00
Laurent Destailleur
2df9df2db0
Debug v11
2019-12-23 12:24:27 +01:00
Laurent Destailleur
d4138876af
Fix alignement in validation popup
2019-12-23 11:16:40 +01:00
Regis Houssin
8321fe6ad2
FIX missing nl2br conversion
2019-12-22 09:13:34 +01:00
Laurent Destailleur
58771c7d8a
Debug MRP v11
2019-12-20 17:39:42 +01:00
Pierre Ardoin
538921f479
#FIX Error Margin with Situation Invoice
...
Fix an issue that show a negative margin when $line->situation_percent is not 100%
Now, the margin price take progress into account.
2019-12-19 10:35:38 +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
3ae87924f1
Fix no user $global $conf into $conf object.
2019-12-18 14:32:23 +01:00
Scrutinizer Auto-Fixer
404ae0c209
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-17 02:00:52 +00:00
Laurent Destailleur
d22cd5c321
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/accountancy/bookkeeping/list.php
2019-12-16 19:09:53 +01:00
Laurent Destailleur
65abe7532c
Fix error message not reported when deleting record in ledger.
2019-12-16 19:05:32 +01:00
Laurent Destailleur
1af67a4336
Merge pull request #12713 from frederic34/doxygen_warning
...
doxygen
2019-12-16 19:02:10 +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
fdf4d86d81
Debug code
2019-12-16 12:38:51 +01:00
Laurent Destailleur
646587a9cf
Value "None" To unbind is more visible.
2019-12-16 11:50:25 +01:00
John Botella
98bd4f3a66
Fix document module call
2019-12-16 09:44:08 +01:00
Laurent Destailleur
95fc14475c
Fix show correct stripe publishable_key on payment mode page
2019-12-15 17:32:45 +01:00
Frédéric FRANCE
9e4fb8d4fe
doxygen
2019-12-15 10:02:20 +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
5e3698b023
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/class/utils.class.php
2019-12-14 14:44:38 +01:00
Laurent Destailleur
17b9964678
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
build/generate_filelist_xml.php
htdocs/core/class/utils.class.php
htdocs/core/lib/files.lib.php
2019-12-14 14:43:14 +01:00
Laurent Destailleur
31a60ff30b
Fix $db
2019-12-14 14:41:27 +01:00
Laurent Destailleur
d1daf94b81
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-12-14 14:34:14 +01:00
Laurent Destailleur
a8de7b850a
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/admin/system/filecheck.php
2019-12-14 14:33:46 +01:00
Laurent Destailleur
835d22f556
Merge branch 'develop' into doxygen_todo
2019-12-14 13:46:40 +01:00
Laurent Destailleur
744e7fc5da
Merge pull request #12703 from frederic34/patch-19
...
doxygen
2019-12-14 13:42:58 +01:00
Laurent Destailleur
65bf2fa285
Merge pull request #12689 from code-chicken/develop
...
Fix: calculation of virtual stock
2019-12-14 13:40:02 +01:00
Laurent Destailleur
d38c73c90a
FIX output of emails from and error on emailing pages.
2019-12-13 15:52:08 +01:00
Rüdiger Hahn
4dd3cb3469
Prevent stock amount from becoming NULL
...
Set stock to 0 if NULL
2019-12-13 07:58:36 +01:00
Frédéric FRANCE
d4dfa840d9
doxygen
2019-12-12 20:48:14 +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
9357bfd98e
doxygen
2019-12-12 08:17:14 +01:00
Frédéric FRANCE
66805a502a
doxygen
2019-12-11 22:53:57 +01:00
Frédéric FRANCE
307bad1d2a
doxygen todo
2019-12-11 19:11:13 +01:00
Laurent Destailleur
c0e23c7b71
Merge pull request #12670 from frederic34/patch-7
...
The variable $id seems to be never defined
2019-12-10 05:53:46 +01:00
Frédéric FRANCE
de741f5dd0
The variable $id seems to be never defined
2019-12-09 23:22:13 +01:00
Frédéric FRANCE
a16e342af6
typo
2019-12-09 23:15:15 +01:00
Laurent Destailleur
67401d717a
Merge pull request #12634 from frederic34/patch-7
...
The variable $out does not seem to be defined for all execution paths
2019-12-09 17:44:06 +01:00
Frédéric FRANCE
407fe902b4
missing $db for line 711
2019-12-09 16:42:57 +01:00
Laurent Destailleur
ae6d536d1d
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/dolibarr_export.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/pdf.lib.php
2019-12-09 13:32:56 +01:00
Laurent Destailleur
94bab15528
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/core/lib/pdf.lib.php
2019-12-09 13:27:30 +01:00
Laurent Destailleur
2ca5a4378b
Fix empty div when no address
...
Fix deletion of MO
2019-12-09 00:54:42 +01:00
Laurent Destailleur
9e479afff1
WIP Complete module MRP
2019-12-09 00:06:51 +01:00
Laurent Destailleur
2b5866aca2
WIP Complete module MRP
2019-12-08 23:45:06 +01:00
Laurent Destailleur
91d83c3d60
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-12-06 17:40:43 +01:00
Laurent Destailleur
796f34628d
Debug v11
2019-12-06 17:40:22 +01:00
Scrutinizer Auto-Fixer
4debd71281
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-06 08:26:49 +00:00
Frédéric FRANCE
f101e919c8
The variable $out does not seem to be defined for all execution paths
2019-12-05 21:30:47 +01:00
Laurent Destailleur
5f148be56f
Fix responsive
2019-12-04 16:43:56 +01:00
Laurent Destailleur
dbee703b18
Fix responsive
2019-12-04 16:23:31 +01:00
Laurent Destailleur
b61434dbef
Avoid log
2019-12-04 15:55:22 +01:00
Laurent Destailleur
b78f310508
Reponsive
2019-12-04 15:49:22 +01:00
Laurent Destailleur
bde917d7fc
Fix responsive
2019-12-04 15:09:20 +01:00
Laurent Destailleur
5a17289e75
Fix crop for proposal image
2019-12-03 18:04:58 +01:00
Laurent Destailleur
573aac8b04
Merge pull request #12594 from frederic34/patch-8
...
The variable xxx does not seem to be defined for all exec paths
2019-12-03 13:22:18 +01:00
Laurent Destailleur
ed462190f6
Merge pull request #12607 from frederic34/patch-18
...
doxygen
2019-12-03 13:18:48 +01:00
Scrutinizer Auto-Fixer
36a74cd160
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-03 10:17:29 +00:00
Frédéric FRANCE
261e166029
doxygen
2019-12-02 20:18:12 +01:00
Florian Mortgat
4846885eea
NEW 9.0: enable user to use the mysqldump '--quick' option
...
(useful if the server has low RAM or large tables)
2019-12-02 16:54:05 +01:00
Laurent Destailleur
92070fa491
Fix name of variable $trigger_name into $triggersendname
2019-12-02 09:38:16 +01:00
Laurent Destailleur
7908e0cd26
Fix crop for MO
2019-12-02 08:46:59 +01:00
Frédéric FRANCE
454d79db58
The variable xxx does not seem to be defined for all exec paths
2019-12-01 20:44:13 +01:00
Laurent Destailleur
7407df2fa3
Merge pull request #12590 from frederic34/patch-7
...
The variable $arraylist seems to be defined...
2019-12-01 18:42:03 +01:00
Frédéric FRANCE
3227f12a6e
The variable $arraylist seems to be defined...
...
The variable $arraylist seems to be defined by a foreach iteration. Are you sure the iterator is never empty, otherwise this variable is not defined?
2019-12-01 18:27:06 +01:00
Frédéric FRANCE
41b5e82d48
The variable $error seems to be never defined
2019-12-01 16:42:18 +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
Maxime Kohlhaas
02b5da5db1
Fix #12448 : notifications were sent to disabled user or contacts
2019-11-30 00:57:21 +01:00
Laurent Destailleur
3b9d2abcb2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/product.lib.php
htdocs/filefunc.inc.php
htdocs/product/class/product.class.php
htdocs/product/list.php
2019-11-29 11:42:08 +01:00
Laurent Destailleur
1636d341c7
Debug module BOM
...
Enhance demo data for TakePOS
2019-11-28 15:18:14 +01:00
Laurent Destailleur
614b82fe88
Fix var not initialized
2019-11-28 14:16:54 +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
altairis
355d7545f6
filter language is an array
2019-11-27 10:23:01 +01:00
Frédéric FRANCE
c7e8194df9
dol_print_error returns void
2019-11-26 18:28:44 +01:00
Laurent Destailleur
4ef6c9cc13
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formticket.class.php
htdocs/langs/en_US/ticket.lang
2019-11-26 11:54:42 +01:00
Laurent Destailleur
b370d70426
Merge pull request #12511 from erpware/develop
...
just fixed two small css issues
2019-11-26 09:20:40 +01:00
Laurent Destailleur
0032b27a8e
Merge pull request #12517 from frederic34/patch-16
...
$out does not seem to be defined for all execution paths
2019-11-26 09:14:55 +01:00
Alexandre SPANGARO
6cc61fef9c
Fix Ticket - Deprecated <center>
2019-11-26 04:32:38 +01:00
Frédéric FRANCE
a142c0050e
$out does not seem to be defined for all execution paths
2019-11-26 00:24:00 +01:00
Frédéric FRANCE
77a300c9ae
doxygen
2019-11-26 00:20:40 +01:00
Daniel Seichter
7a4beb824f
Merge remote-tracking branch 'upstream/develop' into develop
2019-11-25 23:14:19 +01:00
Daniel Seichter
9eafc8f550
fix small css issues
2019-11-25 23:13:31 +01:00
Laurent Destailleur
e2009ceff0
Fix extrafields of line for receptions
2019-11-22 14:22:35 +01:00
Laurent Destailleur
00ad95c01e
Figth against useless dependencies: Remove library the core never use.
2019-11-22 14:06:43 +01:00
Laurent Destailleur
6191307865
Debug v11
2019-11-22 12:22:27 +01:00
Laurent Destailleur
92a65a8039
Log
2019-11-21 21:36:03 +01:00
Laurent Destailleur
5fdd6f698d
More complete error message
...
Conflicts:
htdocs/core/class/CMailFile.class.php
2019-11-21 20:46:27 +01:00
Laurent Destailleur
b46362dff9
More complete error message
2019-11-21 20:45:19 +01:00
stickler-ci
3209d550c2
Fixing style errors.
2019-11-20 11:45:12 +00:00
ptibogxiv
2c810988a6
Update dolgraph.class.php
2019-11-20 12:43:49 +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
6bfb76d40d
Merge pull request #12464 from bb2a/patch-6
...
Update getfullname
2019-11-19 10:55:47 +01:00
Scrutinizer Auto-Fixer
cd7523318d
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-19 08:30:26 +00: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
Laurent Destailleur
918f476c2b
Fix backport fix not checking mandatory extrafields of type select
2019-11-18 19:02:12 +01:00
Laurent Destailleur
16d67a1a8e
Fix several trouble with some types in modulebuilder
...
Fix difference between null and 0
2019-11-17 17:36:36 +01:00
Anthony Berton
7a5883588c
Update commonobject.class.php
2019-11-17 14:07:01 +01:00
Scrutinizer Auto-Fixer
1648fc142e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-16 22:24:29 +00:00
Laurent Destailleur
2689f7515c
Fix pb with colspan and extrafields.
...
Fix remove empty id
2019-11-16 14:38:05 +01:00
Laurent Destailleur
c5b83ca3d8
Fix link translation of
2019-11-16 12:43:44 +01:00
Laurent Destailleur
e5daa73a9e
Merge pull request #12444 from frederic34/doxygen_menubase
...
doxygen menubase class
2019-11-16 00:45:30 +01:00
Laurent Destailleur
3898db3956
FIX #12446
2019-11-16 00:39:23 +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
Frédéric FRANCE
7100328116
doxygen menubase class
2019-11-14 21:25:12 +01:00
Laurent Destailleur
f7ab1498a7
FIX Advisory ID: usd20190053
2019-11-14 17:00:02 +01:00
Laurent Destailleur
7d997990fa
Fix phpcs
2019-11-14 12:44:15 +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
Laurent Destailleur
411e9c87e3
Debug feature to set sender profiles
2019-11-14 11:53:28 +01:00
Laurent Destailleur
75667833fe
Fix missing ->msgid
2019-11-14 10:01:05 +01:00
Laurent Destailleur
95a6d7f8f5
Doxyen
2019-11-14 09:13:15 +01:00
Laurent Destailleur
56f2463a15
Merge branch 'develop' into patch-6
2019-11-14 08:53:53 +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
614faa07c1
Merge pull request #12427 from Dolibarr/scrutinizer-patch-3
...
Scrutinizer Auto-Fixes
2019-11-14 08:49:53 +01:00
Frédéric FRANCE
6596ffac4f
Update conf.class.php
2019-11-13 20:20:35 +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
f4aaa8d9bb
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:34:37 +00:00
Scrutinizer Auto-Fixer
87585c0f2a
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 17:32:11 +00:00
Laurent Destailleur
56c2dc2614
Reduce need of translations
2019-11-12 22:29:36 +01:00
Laurent Destailleur
528823140d
Fix phpcs
2019-11-12 12:05:06 +01:00
Laurent Destailleur
6afc84fe72
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-11-12 10:20:55 +01:00
Laurent Destailleur
944a15d06b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-11-12 10:20:16 +01:00
Laurent Destailleur
f8e8d15606
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-11-12 10:19:01 +01:00
Laurent Destailleur
f65ce1d5d0
Fix var not declared
2019-11-12 10:17:46 +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
Laurent Destailleur
dc77a58a73
Work on MO
2019-11-12 01:48:12 +01:00
Laurent Destailleur
814dce5b55
Fix var not defined
2019-11-11 19:26:19 +01:00
Laurent Destailleur
27fb9e0c7f
Merge pull request #12401 from grandoc/new_branch_10_11_2019
...
add some comment
2019-11-10 18:07:13 +01:00
Laurent Destailleur
0a824db6d3
Remove useless call
2019-11-10 17:48:50 +01:00
stickler-ci
f8138c22a3
Fixing style errors.
2019-11-10 10:12:10 +00:00
Philippe GRAND
9bf4347371
add some comment
2019-11-10 11:11:43 +01:00
Laurent Destailleur
5ebd5a401c
Fix avoid error on lang not defined when calling trigger
2019-11-09 13:09:05 +01:00
Laurent Destailleur
ab26356e92
Fix avoid error on lang not defined when calling trigger
2019-11-09 13:08:30 +01:00
Laurent Destailleur
c0abb725cb
Fix price2num needs lang loaded when it may not exists
2019-11-09 12:46:45 +01:00
Laurent Destailleur
f9869dbfed
Fix price2num need langs when lang is not necessarly loaded.
2019-11-09 12:46:11 +01:00
Laurent Destailleur
dcdcd7c67e
Look and feel v11
2019-11-09 12:03:11 +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
Laurent Destailleur
83090629fe
Fix join into left join
2019-11-08 13:43:26 +01:00
Laurent Destailleur
4f219ae0fb
Fix doc
2019-11-07 11:16:59 +01:00
Laurent Destailleur
5b13b9f1ff
Merge pull request #12358 from frederic34/patch-20
...
dol_hash may salt so gravatar is not working
2019-11-07 10:37:45 +01:00
Laurent Destailleur
74f2983ee1
Debug modulebuilder
2019-11-06 19:38:51 +01:00
Frédéric FRANCE
a1c8e04646
dol_hash may salt so gravatar is not working
2019-11-06 07:50:21 +01:00
Laurent Destailleur
027d94d41a
Revert change that create not required new lines
2019-11-06 00:51:26 +01:00
Laurent Destailleur
e885345ef7
FIX Check on duplicate profid was not triggered.
2019-11-06 00:27:36 +01:00
Laurent Destailleur
4c01f33228
Fix removed a debug die
2019-11-05 15:57:22 +01:00
Laurent Destailleur
85ce5176b5
Fix textarea to enter a ticket
2019-11-05 13:41:01 +01:00
Laurent Destailleur
ce1dec253f
FIX #11364
2019-11-05 12:47:38 +01:00
Laurent Destailleur
4d84ee2041
Fix var not init
2019-11-05 10:15:00 +01:00
Laurent Destailleur
9499398f86
Code syntax
2019-11-05 10:11:28 +01:00
Laurent Destailleur
1aef1c60dd
Merge pull request #11867 from frederic34/socialnetworks
...
NEW add socialnetworks dictionary
2019-11-04 21:10:22 +01:00
Frédéric FRANCE
6ad983bb7b
Merge remote-tracking branch 'upstream/develop' into escpos
2019-11-04 18:52:29 +01:00
Laurent Destailleur
11500fb8d9
FIX confusion between permto... and permisstionto...
2019-11-04 15:33:49 +01:00
Laurent Destailleur
b0ea276233
Debug MO module
2019-11-04 14:13:36 +01:00
Laurent Destailleur
1f6a86e166
Fix look and feel v11
2019-11-04 13:32:34 +01:00
Frédéric FRANCE
872f58f261
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-11-03 21:48:24 +01:00
Frédéric FRANCE
877f40a1c8
price
2019-11-03 20:07:11 +01:00
Frédéric FRANCE
5a3347104f
rework an experimental module
2019-11-03 12:57:06 +01:00
Frédéric FRANCE
d797ea590e
rework an experimental module
2019-11-03 00:50:58 +01:00
Frédéric FRANCE
59b30b9cec
wip ticket printer
2019-11-02 21:15:48 +01:00
Laurent Destailleur
2ee002fc80
Fix trans
2019-11-02 17:44:58 +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
496f93911f
Merge pull request #11821 from Tim-Otte/develop
...
NEW Extrafields support in product supplier prices
2019-11-02 16:19:13 +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
906f30773d
Merge pull request #12269 from atm-ph/new_edit_comment
...
New update comments is now available
2019-11-02 13:09:21 +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
f9031cdbfd
Clean code
2019-11-02 11:36:48 +01:00
Laurent Destailleur
68c971a2b5
All properties 'type_libelle' were renamed into 'type_label'.
2019-11-02 11:12:57 +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
Laurent Destailleur
8608c5db9c
Fix color of task progression
2019-11-01 23:16:08 +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
f74833cfe1
Make modulebuilder more compatible with multicompany
2019-11-01 18:44:32 +01:00
Laurent Destailleur
012c5ef0c4
Can use substitution variables into filter of fields link
2019-11-01 18:35:48 +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
db9c490470
Update emailsenderprofile.class.php
2019-11-01 11:18:54 +01:00
Philippe Grand
74ae90f9da
Update commonobject.class.php
2019-11-01 11:18:12 +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
f98df3c807
NEW Can edit link to the translation page in website module
2019-10-31 21:09:33 +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
dcbe7fe8da
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-10-31 14:06:36 +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
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
atm-ph
2f68a73a2a
New update comments is now available
2019-10-30 15:45:04 +01:00
Marc de Lima Lucio
85cef09e83
FIX: triggers: directories read with opendir() never closed
2019-10-30 14:46:46 +01:00
Laurent Destailleur
66a288a343
Merge pull request #12235 from frederic34/scopeindent
...
clean indent
2019-10-30 02:57:59 +01:00
Laurent Destailleur
05fdddd15e
Merge pull request #12240 from frederic34/patch-19
...
Update html.formmail.class.php
2019-10-30 02:57:27 +01:00
Laurent Destailleur
f03bf149bd
Fix autoselect of field with modulebuilder
2019-10-30 02:09:29 +01:00
Laurent Destailleur
bc3f088f50
Enhance modulebuilder
...
Work on MO
2019-10-30 01:35:41 +01:00
Frédéric FRANCE
a9447bc963
Update html.formmail.class.php
2019-10-27 18:08:21 +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
e2afcfb999
clean indent
2019-10-27 11:53:20 +01:00
Frédéric FRANCE
e203f87c84
clean indent
2019-10-27 11:18:36 +01:00
Laurent Destailleur
5cb9434bb4
FIX Stock qty hidden without permission to see stock
2019-10-27 00:55:06 +02:00
Laurent Destailleur
e17cc5b2e5
Debug cloning of BOMs
2019-10-27 00:26:11 +02:00
Frédéric FRANCE
a43e6f96b5
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-25 08:12:54 +02:00
Laurent Destailleur
8d21144521
Beautify select of products in vendor record
2019-10-24 20:33:16 +02:00
Laurent Destailleur
7297514afb
NEW Use the gender of member for picto in member lists.
2019-10-23 21:00:29 +02:00
Laurent Destailleur
fd04729727
Fix tooltip on extrafield title was on wrong line.
2019-10-23 20:35:39 +02:00
Laurent Destailleur
b48f08dd07
Theme v11
2019-10-23 20:12:29 +02:00
Laurent Destailleur
a8ca8c7a1f
Fix edit of extrafields link when empty
2019-10-23 16:38:15 +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
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
Laurent Destailleur
b88968520b
Move code of extrafields to the new architecture
2019-10-22 17:08:37 +02:00
Laurent Destailleur
5ad7ca5620
Code more generic around setting projet on a card
2019-10-22 13:43:24 +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
Tim Otte
ad51e862e4
Merged
2019-10-22 11:39:32 +02:00
Tim Otte
ceb3482204
Requested changes implemented
2019-10-22 11:36:28 +02:00
Laurent Destailleur
aa4afcfe8a
NEW Can set a filter on object linked in modulebuilder.
2019-10-22 03:49:09 +02:00
Laurent Destailleur
6aa2ceac1a
Fix phpcs
2019-10-22 02:53:29 +02:00
Laurent Destailleur
8e474701c1
Fix missing token
2019-10-21 15:49:08 +02:00
Laurent Destailleur
e261d63295
NEW Can add a button "Create" after combo of object with modulebuilder.
2019-10-21 14:44:39 +02:00
Laurent Destailleur
528ded58cf
Merge pull request #12187 from c3do/develop
...
NEW Add API to get Country by code and iso
2019-10-20 21:26:44 +02:00
Alfredo Altamirano
d921b08e5c
Translate documentation of translate class
2019-10-20 11:44:07 -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
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
c3do
4fb0d03500
NEW Add API to get Country by code and iso
2019-10-20 15:25:18 +02:00
Laurent Destailleur
49c101bb77
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-10-20 15:16:51 +02:00
Laurent Destailleur
d79114c1f8
Clean code
2019-10-20 15:16:40 +02:00
Laurent Destailleur
8ce6197314
Update commondocgenerator.class.php
2019-10-20 14:37:15 +02:00
Laurent Destailleur
1b3d6d749a
Merge pull request #12175 from Shnoulle/develop
...
Close #12098 : allow usage of AUTH LOGIN in smtp
2019-10-20 13:48:24 +02:00
Laurent Destailleur
e95861c361
Update smtps.class.php
2019-10-20 13:48:01 +02:00
Laurent Destailleur
3b5e62947d
Update smtps.class.php
2019-10-20 13:44:28 +02:00
Laurent Destailleur
84f6fd64a9
Merge pull request #12176 from Ahuahuachi/develop
...
Translation of some function documentation
2019-10-20 13:31:25 +02:00
Frédéric FRANCE
360bf55f5b
clean indent
2019-10-20 01:09:11 +02:00
Alfredo Altamirano
9d9961e936
Translate documentation
2019-10-19 16:55:27 -05:00
Alfredo Altamirano
1ede09c21a
Fix typo
2019-10-19 11:17:53 -05:00
Denis Chenu
88100a53aa
Close #12098 : allow usage of AUTH LOGIN in smtp
...
Global variable MAIL_SMTP_AUTH_TYPE can be used to PLIAN to allow AUTH PLAIN authentification. Default still AUTH LOGIN.
2019-10-18 17:35:52 +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
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
c64a537bfd
Merge pull request #12155 from frederic34/patch-14
...
Update html.formticket.class.php
2019-10-17 17:42:30 +02:00
Laurent Destailleur
40a9b95696
Merge pull request #12148 from homer8173/patch-7
...
use current local time on Now button
2019-10-17 17:41:16 +02:00
Laurent Destailleur
084ab53b4b
Fix translation
2019-10-17 12:14:38 +02:00
Frédéric FRANCE
46d2bf3317
Update html.formticket.class.php
2019-10-16 23:18:14 +02:00
Frédéric FRANCE
219a4b4374
Update html.formticket.class.php
2019-10-16 23:08:04 +02:00
Frédéric FRANCE
701afc99e9
Update html.formticket.class.php
2019-10-16 23:03:59 +02:00
Frédéric FRANCE
4bc0a6db2d
Update html.formticket.class.php
2019-10-16 22:56:29 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
2019-10-16 20:00:01 +02:00
Laurent Destailleur
8a7a0b80e2
Fix remove warnings
2019-10-16 19:08:31 +02:00
Laurent Destailleur
41dd53170e
Code comment
2019-10-16 19:07:17 +02:00
stickler-ci
fce1f1991c
Fixing style errors.
2019-10-16 12:34:42 +00:00
Norbert Penel
8d75e83e55
use current local time on Now button
...
use current local time for feed the date according to locale settings
2019-10-16 14:32:17 +02:00
stickler-ci
bba042c0c3
Fixing style errors.
2019-10-16 10:34:47 +00:00
Norbert Penel
8d49609549
Fix user time instead of server time
...
it seems that we want to use a user time by clicking on now button.
IDEA : may i use client time ??? because if page is old, the now button insert an old time.
2019-10-16 12:28:50 +02:00
Laurent Destailleur
b0355dd149
Module BOM have now status DRAFT, VALIDATED, DISABLED
2019-10-16 01:20:58 +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
a1c93cb2e6
MAIN_ACTIVATE_HTML5 is now always on now (so option removed).
...
Look and feel v11
2019-10-15 02:45:12 +02:00
Laurent Destailleur
f50a75194c
Removed warning
2019-10-15 00:44:22 +02:00
Frédéric FRANCE
2351750d2b
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-14 19:02:46 +02:00
Laurent Destailleur
7973b03201
NEW Add estimated duration on the BOM module
2019-10-14 11:38:36 +02:00
Frédéric FRANCE
d9ba09bec1
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-12 19:02:24 +02:00
Frédéric FRANCE
9f59656589
fix typo inspired by grandoc
2019-10-11 23:08:33 +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
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
Philippe Grand
bcb7365a5a
Update commondocgenerator.class.php
2019-10-11 10:13:21 +02:00
Philippe GRAND
af88f44fd9
fix some translations
2019-10-11 09:51:17 +02:00
Frédéric FRANCE
03bbfc6ad9
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-10 23:24:50 +02:00
Laurent Destailleur
a8676e63c8
CSS
2019-10-10 16:46:50 +02:00
Laurent Destailleur
e2113c2f33
Fix sort lost after uploading a file
2019-10-10 16:41:24 +02:00
Frédéric FRANCE
02b706f9c0
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-09 13:40:46 +02:00
Frédéric FRANCE
5ac8ba8c65
fix travis
2019-10-08 22:13:19 +02:00
Frédéric FRANCE
f253315c8d
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-08 18:30:58 +02:00
stickler-ci
7e841350db
Fixing style errors.
2019-10-08 13:24:41 +00:00
Laurent Destailleur
06eedece26
Merge pull request #11371 from bafbes/abb90058
...
New:Show labels of countries in modulebuilder
2019-10-08 15:17:16 +02:00
Laurent Destailleur
c724eef85c
Update ccountry.class.php
2019-10-08 15:16:56 +02:00
Laurent Destailleur
bd867f5e80
Update ccountry.class.php
2019-10-08 15:16:23 +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
c6c498fd67
Merge pull request #11829 from atm-florian/dev_contactdefault
...
NEW : Address/Contact by default on third parties
2019-10-07 15:27:58 +02:00
Laurent Destailleur
a9c844460b
Debug use of widget on Accounting home page
2019-10-07 14:39:29 +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
c2a7ae23bc
Merge pull request #12034 from aspangaro/11_faicon
...
Fix Fa-icon
2019-10-07 13:03:27 +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
atm-lena
8c024b3786
FIX : missing "$this->id" in "fetch" function
2019-10-07 11:26:10 +02:00
Laurent Destailleur
fc90638b2b
Code comment
2019-10-07 10:42:18 +02:00
Frédéric FRANCE
f80fa08a2d
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-07 07:57:05 +02:00
Laurent Destailleur
80c1a92872
FIX Load chart of account only if we click or select button "Load chart"
2019-10-06 21:11:29 +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
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
Laurent Destailleur
e90234c2bc
FIX escape email alias
2019-10-05 14:27:37 +02:00
Laurent Destailleur
c36d49a8c3
FIX escape email alias
2019-10-05 14:15:14 +02:00
Laurent Destailleur
827b1fe5d2
Use small image instead of mini for preview on document list
2019-10-05 11:17:09 +02:00
Laurent Destailleur
8bf9afb7ca
FIX Attachement of linked files on ticket when sending a message
2019-10-04 19:41:35 +02:00
florian HENRY
2d3dd9ed3c
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
2019-10-04 18:10:16 +02:00
Alexandre SPANGARO
ddadff5731
Add globe fa-icon
2019-10-03 21:32:55 +02:00
Frédéric FRANCE
0383fdbeee
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-03 18:37:14 +02:00
Laurent Destailleur
e9163015e5
Merge pull request #12029 from altatof/limitlang
...
NEW : add MAIN_LANGUAGES_ALLOWED constant to limit languages displayed
2019-10-03 18:08:35 +02:00
Laurent Destailleur
b787e53020
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-10-03 17:54:58 +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
d9aa816197
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-10-03 17:52:06 +02:00
Laurent Destailleur
75be637b0b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-10-03 17:50:57 +02:00
altairis
699a3391c9
FCKeditor setup for tickets
2019-10-03 16:51:05 +02:00
stickler-ci
3168ad404c
Fixing style errors.
2019-10-03 13:56:33 +00:00
altairis
153121b95d
add MAIN_LANGUAGES_ALLOWED constant
2019-10-03 15:48:24 +02:00
Frédéric FRANCE
0d41216624
Update dolgraph.class.php
2019-10-03 00:22:14 +02:00
Frédéric FRANCE
3afb4355a8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-02 18:59:18 +02:00
Laurent Destailleur
24570f7165
Look and feel v11. Picto are fontawesome.
2019-10-02 18:14:41 +02:00
Laurent Destailleur
320e9bbeec
Text on tooltip can also be clickable
2019-10-02 15:54:42 +02:00
Laurent Destailleur
c6d38227b6
NEW Use a dedicated css for the pencil to edit a field
2019-10-02 14:44:38 +02:00
Laurent Destailleur
66829aa615
Use span instead of div by default for the tooltip picto.
2019-10-02 14:33:31 +02:00
Frédéric FRANCE
ad3cbd17c2
backport commit for setmulticurrency
...
a489207122 (diff-48f18024fb928ce21b76ef02fc967c67)
2019-10-02 11:12:30 +02:00
Alexandre SPANGARO
94179f712d
Update areacode
2019-10-02 08:58:25 +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
florian HENRY
d48f0fa791
resolve conflixt
2019-10-01 18:07:59 +02:00
Laurent Destailleur
68055e579f
Check array is array
2019-10-01 16:26:55 +02:00
Laurent Destailleur
8ad81a092a
Clean code
2019-10-01 16:19:54 +02:00
Laurent Destailleur
1ff8b879a8
Fix phpcs
2019-10-01 16:10:35 +02:00
Laurent Destailleur
29a2601b9d
Merge pull request #11567 from inoveaconseil/ContextDashboard
...
WIP: Context dashboard
2019-10-01 15:21:35 +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
Frédéric FRANCE
52b0a0d609
The variable $out seems to be never defined.
2019-10-01 13:45:18 +02:00
Frédéric FRANCE
3b9bf2b06a
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-01 12:25:34 +02:00
Laurent Destailleur
15e646cc62
Fix bad name of trigger
2019-10-01 11:34:35 +02:00
Laurent Destailleur
c7da05e4a1
Fix bad name of trigger
2019-10-01 11:28: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
Frédéric FRANCE
b87610adcc
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-30 19:34:35 +02:00
Frédéric FRANCE
a5fce6cca8
Update CMailFile.class.php
2019-09-30 18:25:54 +02:00
Laurent Destailleur
b390cff172
Fix css
2019-09-30 17:22:22 +02:00
Laurent Destailleur
d65af06d20
Merge pull request #11869 from atm-john/new_ticket_messaging_page
...
New ticket messaging page design
2019-09-30 15:34:35 +02:00
Laurent Destailleur
d8de78dca9
Merge pull request #11984 from fuhraih/develop
...
Fix 11554 and 7533
2019-09-30 15:31:41 +02:00
Laurent Destailleur
5b582d1117
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-09-30 15:18:28 +02:00
Laurent Destailleur
bc1e59ee23
Merge pull request #11982 from frederic34/patch-13
...
Add sendcontext to notification emails
2019-09-30 15:18:12 +02:00
Laurent Destailleur
7dd4a829a5
Comment
2019-09-30 15:18:05 +02:00
Laurent Destailleur
d2881eb85b
FIX CSS
...
Conflicts:
htdocs/core/tpl/extrafields_list_search_input.tpl.php
2019-09-29 19:26:37 +02:00
Laurent Destailleur
8acf7298b2
FIX CSS
2019-09-29 19:22:01 +02:00
Frédéric FRANCE
1b151da776
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-29 11:28:54 +02:00
stickler-ci
103efbbe5b
Fixing style errors.
2019-09-28 20:55:58 +00:00
Alexandre SPANGARO
8e42ac8cd0
Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal
2019-09-28 22:31:08 +02:00
Laurent Destailleur
2b57d486dc
NEW Upgrade ACE editor to v1.4.6
2019-09-28 13:50:32 +02:00
Frédéric FRANCE
2eaf3c0dda
Add sendcontext to notification emails
2019-09-28 10:25:00 +02:00
Frédéric FRANCE
cea3669ffa
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-28 00:35:14 +02:00
obrunet
3e4e64ab1a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2019-09-27 21:36:35 +02:00
fuhraih
40a8fe3e79
FIX #11554 Extrafields: members autosubscription formular issue
2019-09-27 21:26:06 +02:00
florian HENRY
885d958e63
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
2019-09-27 20:12:09 +02:00
Laurent Destailleur
d0d884742f
FIX #11861 Not consistent code to manage measuring units
2019-09-27 19:45:33 +02:00
Laurent Destailleur
46e019642f
Code comment
2019-09-27 17:51:22 +02:00
stickler-ci
a8e73533b9
Fixing style errors.
2019-09-27 13:43:11 +00:00
Tim Otte
10f7bd3494
Restricted query of ExtraFields for supplier orders
2019-09-27 15:42:57 +02:00
Laurent Destailleur
a4d405c6f9
Merge pull request #11906 from OPEN-DSI/new-form-products-select-labels-units
...
NEW Add units in select products lines
2019-09-27 15:30:44 +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
6858dce344
Rename table for categorie of warehouses
2019-09-27 13:28:28 +02:00
Laurent Destailleur
ed99b71df4
Merge pull request #11915 from frederic34/patch-12
...
Update CMailFile.class.php
2019-09-27 12:26:55 +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
Frédéric FRANCE
03086026b8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-27 08:06:13 +02:00
Laurent Destailleur
aa5f35f14f
Fix image on ticket
2019-09-26 14:28:34 +02:00
altairis
c59e26457d
add MAIN_SHOW_COMPANY_NAME_IN_BANNER_ADDRESS constant
2019-09-25 12:18:19 +02:00
Tim Otte
b673c88fab
Fixed sql error
2019-09-25 10:25:00 +02:00
Ferran Marcet
1c9c72ced7
Qual: Clean code on sellist extrafields. Translate if query has only one field
2019-09-24 17:52:11 +02:00
Laurent Destailleur
b3c49f2ec8
End of dev for extrafields on holiday
2019-09-24 16:26:15 +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
Laurent Destailleur
c53be23122
FIX Filtering the HTTP Header "Accept-Language".
2019-09-24 13:54:52 +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
6d4c0c34b1
Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal
2019-09-23 20:43:06 +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
Laurent Destailleur
1584a4bf79
Add trigger event USER_SENTBYMAIL in agenda
2019-09-23 12:27:51 +02:00
Alexandre SPANGARO
e32772fdc5
Translate
2019-09-20 09:44:49 +02:00
gauthier
2ac8bd4e16
FIX : If we share invoice, we need to see discount created from a deposit on each entity
2019-09-17 11:59:58 +02:00
Frédéric FRANCE
a44836ae40
Update CMailFile.class.php
2019-09-17 10:15:55 +02:00
VESSILLER
3654a5d01c
FIX selectFields for GROUP BY and show only if units defined
2019-09-17 10:05:35 +02:00
VESSILLER
555ea977c9
NEW Add units in select products lines
2019-09-16 15:32:31 +02:00
Laurent Destailleur
0194f48041
Merge pull request #10795 from altatof/clonecat
...
NEW : copy linked categories on product clone process
2019-09-15 16:34:42 +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
TuxGasy
e0238705cc
Check if childtablesoncascade is not empty
2019-09-14 19:04:43 +02:00
Frédéric FRANCE
904d0ecaee
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-14 18:42:31 +02:00
Laurent Destailleur
9f6fe0bf5a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/orders.lang
2019-09-14 18:27:58 +02:00
Frédéric FRANCE
6444c7378f
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-14 16:40:23 +02:00
Laurent Destailleur
1d865a250e
Merge pull request #11866 from bafbes/abb100076
...
fix: repetition in error message
2019-09-14 16:39:24 +02:00
Laurent Destailleur
c015bbda14
Update ldap.class.php
2019-09-14 16:39:08 +02:00
Laurent Destailleur
aad6b003fb
Add cache in fetch_optionnals() to avoid duplicate call to
...
fetch_name_optionals_label
2019-09-14 00:02:48 +02:00
florian HENRY
224b4c147a
Merge branch '10.0' of https://github.com/Dolibarr/dolibarr into 10.0
2019-09-13 15:25:25 +02:00
florian HENRY
7966bfc2df
fix: fill id for links (document tab)
2019-09-13 15:25:16 +02:00
ATM john
907669bb51
New ticket messaging page
2019-09-11 23:30:09 +02:00
Frédéric FRANCE
3fddef0c9e
add socialnetworks dictionary
2019-09-11 22:27:09 +02:00
Abbes Bahfir
797bab4741
fix: repetition
2019-09-11 18:44:12 +01:00
Tim Otte
8f4b2436e4
Ooops
2019-09-10 09:13:42 +02:00
Tim Otte
0c68a7b0e6
Possible solution for the problem "SELECT * is forbidden by SQL rules"
2019-09-10 09:11:31 +02:00
florian HENRY
d081a73dca
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
2019-09-10 08:36:54 +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
08f8ad6f30
FIX javascript error when using dol_use_jmobile=1
2019-09-10 00:09:18 +02:00
florian HENRY
617e430998
fix stravis and sticker
2019-09-09 12:31:17 +02:00
florian HENRY
63a83a0fa5
resolve conflict
2019-09-09 11:35:37 +02:00
david
ac539d20b9
FIX #10460 compatibility with MariaDB 10.4
2019-09-09 11:10:08 +02:00
florian HENRY
bdb297a380
resolve conflict
2019-09-09 10:15:44 +02:00
david
48b2a11da2
FIX #10460 compatibility with MariaDB 10.4
2019-09-08 05:15:26 +02:00
Laurent Destailleur
d6f105c783
Work on MRP module
2019-09-07 15:44:48 +02:00
Laurent Destailleur
7fe2483a82
Merge branch 'develop' into Hook_on_commonGenerateDocument
2019-09-07 10:26:23 +02:00
Laurent Destailleur
231725e351
Fix scrutinizer
2019-09-06 19:12:43 +02:00
Laurent Destailleur
a5f7211730
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/install/repair.php
2019-09-06 16:10:55 +02:00
Laurent Destailleur
165f64463b
Fix look and feel v10
2019-09-06 12:46:54 +02:00
Laurent Destailleur
123eace8c0
Fix look and feel v10
2019-09-06 12:44:23 +02:00
Laurent Destailleur
bb81f66a1a
Add phpunit test for Lessc
2019-09-06 10:36:49 +02:00
florian HENRY
dff7be59c8
mostlyDone
2019-09-06 09:22:53 +02:00
Laurent Destailleur
ec1751bae9
Doxygen
2019-09-06 02:47:20 +02:00
stickler-ci
cd96238adc
Fixing style errors.
2019-09-05 14:19:35 +00:00
Christophe Battarel
6902b2cbf2
fix function visibility thanks to stckler
2019-09-05 16:14:15 +02:00
Christophe Battarel
1cfd5615d3
resolv conflict
2019-09-05 16:10:23 +02:00
Laurent Destailleur
07e647ca10
Fix sql outside transaction
2019-09-05 14:27:13 +02:00
Laurent Destailleur
f62c79c445
Fix object user must be a param of delete method
2019-09-05 14:26:18 +02:00
Tim Otte
54d0b94b6d
Added extrafield support to the product supplier price lines
2019-09-04 15:13:42 +02:00
Laurent Destailleur
b445c0eec7
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/dolibarr_export.php
2019-09-03 22:40:26 +02:00
Laurent Destailleur
0a17e6bfd5
FIX Several pb in export of documents
...
FIX Must escape shell
FIX Must exclude logs and some dirs for compressed backup
FIX gzip and bzip2 must use option -f
2019-09-03 22:39:24 +02:00
Laurent Destailleur
1a8f271bf4
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-09-03 17:41:56 +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
florian HENRY
73c5b9617f
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
2019-09-03 17:07:59 +02:00
florian HENRY
6c20fbafdf
add trigger files
2019-09-03 17:04:42 +02:00
Laurent Destailleur
2c02e4d118
Merge branch 'develop' into FIX_cron_module_conf_to_display_link_to_cron_task_list
2019-09-03 15:28:52 +02:00
Laurent Destailleur
3c80bc139e
Merge pull request #11794 from atm-florian/10_fixMissingSubstitutionCheckbox
...
FIX bad substitution for extrafields type checkbox
2019-09-03 15:18:17 +02:00
florian HENRY
d811de4da2
let only triggers part
2019-09-02 22:01:48 +02:00
florian HENRY
405c92640c
on going
2019-09-02 14:47:32 +02:00
florian HENRY
c8bfc7441e
fix avoid error message Divided By 0
2019-09-02 09:44:59 +02:00
florian HENRY
7dc3684662
fix bad substitution for extrafields type checkbox
2019-09-02 09:41:30 +02:00
Laurent Destailleur
ac7d0b5eb6
Fix scrutinizer
2019-09-02 04:12:48 +02:00
Laurent Destailleur
a4600c9efa
Fix missing class reposition
2019-09-01 23:24:29 +02:00
Laurent Destailleur
aff4118dc9
Fix missing class reposition
2019-09-01 23:24:02 +02:00
Laurent Destailleur
0889f2f537
Start to enable MAIN_SECURITY_CSRF_WITH_TOKEN (for develop)
2019-08-31 14:41:54 +02:00
Laurent Destailleur
cc5dad977c
Fix scrutinizer
2019-08-31 02:17:06 +02:00
Laurent Destailleur
5188f3ed44
Fix doxygen
2019-08-31 02:10:55 +02:00
Laurent Destailleur
517a0091d6
Doxygen
2019-08-31 02:02:19 +02:00
Laurent Destailleur
01962cbc67
Clean code
2019-08-29 13:17:14 +02:00
Inovea Conseil
ac7bcbd1b2
Add main feature level
2019-08-29 10:59:36 +02:00
Laurent Destailleur
77dfc19389
Try to compile css with lessc
2019-08-29 04:38:24 +02:00
Laurent Destailleur
76e8384f09
NEW Add option multiselect for developers on the selector of language.
2019-08-28 16:06:19 +02:00
Maxime Kohlhaas
9c09876bd4
Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_choose_lines_from_origin
2019-08-27 14:33:34 +02:00
Maxime Kohlhaas
4bd806ea65
Move $selectedlines to parameter
2019-08-27 14:33:28 +02:00
John Botella
c2f570ae60
FIX: remove disabled product type from product list
2019-08-27 11:54:20 +02:00
Laurent Destailleur
9fb06b1e7e
Fix phpcs
2019-08-27 11:42:18 +02:00
Jean Traullé
dd1e7bbc3d
Merge branch 'develop' into stickler-ci
2019-08-27 08:52:33 +02:00
Jean Traullé
0702ef4e0f
Fix CI (code style)
2019-08-27 08:43:58 +02:00
Laurent Destailleur
b1479e5787
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-27 03:41:27 +02:00
Laurent Destailleur
63dcef710e
Fix phpcs
2019-08-27 03:41:02 +02:00
Laurent Destailleur
a77c8023dc
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-27 03:23:59 +02:00
Laurent Destailleur
4fb36ce84d
Fix phpcs
2019-08-27 03:22:58 +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
b6db04a727
Fix add missing filter on entity on stock listing for product combo
2019-08-26 22:42:04 +02:00
Laurent Destailleur
76bd9a09a6
FIX #11570
2019-08-26 22:34:41 +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
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
7cb68d6438
NEW Default for Stripe is STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION
2019-08-25 18:02:10 +02:00
Laurent Destailleur
4040693823
FIX Use a SCA ready workflow with Stripe module
2019-08-24 18:12:20 +02:00
Laurent Destailleur
f5aede8256
NEW GeoIP v2 support is natively provided.
2019-08-21 19:38:45 +02:00
Laurent Destailleur
bfbabbf626
Update geoip v1
2019-08-21 18:26:41 +02:00
Laurent Destailleur
eb0644c6f4
PSR-12
2019-08-21 13:00:22 +02:00
Laurent Destailleur
d2d7fb4b04
Fix management of collapsing of extrafields separators.
2019-08-21 03:38:57 +02:00
Laurent Destailleur
5351d78a96
Merge branch 'develop' into develop_new_dashboard
2019-08-18 01:26:56 +02:00
Laurent Destailleur
18eb2a83fe
FIX #11671 CVE-2019-15062
2019-08-17 22:17:27 +02:00
Laurent Destailleur
d21e557100
FIX #11671 CVE-2019-15062
2019-08-17 22:16:27 +02:00
Laurent Destailleur
ae7ba9ff54
Doc
2019-08-17 15:15:52 +02:00
Laurent Destailleur
a746075dbe
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2019-08-16 17:04:28 +02:00
Laurent Destailleur
9692ea5faf
FIX #11671 CVE-2019-15062
2019-08-16 16:41:53 +02:00
Laurent Destailleur
8874a0f3c1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-15 23:39:11 +02:00
Laurent Destailleur
386f929fe3
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/lib/website.lib.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
2019-08-15 23:39:02 +02:00
Laurent Destailleur
b8406f842d
Merge pull request #10655 from atm-quentin/FIX_credit_note_used_on_list
...
Fix total on list and amount opened on thirdparty card (for supplier)
2019-08-15 21:14:03 +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
163ae6d81a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-15 20:42:51 +02:00
Laurent Destailleur
12e6dabc43
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-08-15 20:41:56 +02:00
Laurent Destailleur
0cde1b5c93
Merge pull request #11676 from ptibogxiv/patch-222
...
Fix force recalculate price with multicurrency
2019-08-15 19:53:54 +02:00
Laurent Destailleur
9f18b3d690
Update commonobject.class.php
2019-08-15 19:53:38 +02:00
Laurent Destailleur
38fc05866d
Merge pull request #11619 from simnandez/10.0
...
Fix: allow access from any other class that inherits Form class.
2019-08-15 19:48:41 +02:00
Laurent Destailleur
ffece8dd34
Better link for syntax help
2019-08-15 18:46:48 +02:00
Laurent Destailleur
b5d72edebc
Can add more samples of pages. Add an exemple of page with dynamic
...
content.
2019-08-15 18:07:36 +02:00
Laurent Destailleur
87b2a01a35
NEW Add less 2 css converter
2019-08-14 19:49:07 +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
ptibogxiv
a489207122
Fix force recalculate price with multicurrency
2019-08-12 13:56:12 +02:00
Laurent Destailleur
deb6186338
Merge pull request #11569 from aspangaro/11.0_fiscalyear
...
NEW Box use fiscal year
2019-08-10 01:47:55 +02:00
John Botella
401dc12b93
Add color blind option in body for css impact
2019-08-07 12:15:55 +02:00
John Botella
63191dab7d
Add user color blind option
2019-08-07 12:03:19 +02:00
John Botella
cafd4fc599
New living color for chart
2019-08-06 15:24:42 +02:00
John Botella
bc0508164b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard
2019-08-06 09:57:49 +02:00
Ferran Marcet
32220dde2e
FIX: Wrong variable. Must be PROJECT_HIDE_UNSELECTABLES
2019-08-05 14:12:19 +02:00
Laurent Destailleur
d663657f15
FIX format of field with type timestamp
2019-08-04 13:06:48 +02:00
Laurent Destailleur
31648f856c
FIX format of field with type timestamp
2019-08-04 13:04:37 +02:00
Laurent Destailleur
5b2ca3b631
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/commonobject.class.php
2019-08-03 16:37:25 +02:00
Laurent Destailleur
25ee539f92
FIX Missing where on entity
...
Conflicts:
htdocs/core/class/commonobject.class.php
2019-08-03 16:35:15 +02:00
Laurent Destailleur
acf8314935
FIX Missing where on entity
2019-08-03 16:32:35 +02:00
Alexandre SPANGARO
7eb48a3f9c
Fix month of the fiscal year start min 1 max 12 / january = 1
2019-08-03 06:04:42 +02:00
Alexandre SPANGARO
552f160235
Merge branch 'develop' into 11.0_fiscalyear
2019-08-03 05:59:57 +02:00
Laurent Destailleur
55e9335cd2
Fix code comment
2019-08-02 19:26:04 +02:00
Laurent Destailleur
4fb8f6663a
Fix code comment
2019-08-02 17:16:13 +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
Juanjo Menent
03a2377abc
Fix: allow access from any other class that inherits Form class.
2019-08-02 12:31:24 +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
6512435f9f
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/modules/cheque/doc/pdf_blochet.class.php
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
2019-08-01 16:27:55 +02:00
Laurent Destailleur
a260e7391f
FIX for #11232
2019-08-01 14:24:54 +02:00
John Botella
9b84987cc1
prepare new dashboard
2019-08-01 12:33:19 +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
ed7a57e3ef
Merge pull request #11571 from atm-john/9.0_fix_showOutputField
...
Fix sellist showOuputField
2019-07-30 21:40:37 +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
Vaadasch
23bca6f4cd
Change "DOCUMENT_URI" to "PHP_SELF"
...
DOCUMENT_URI works with Apache. To be compliant with Nginx and probably some others, use PHP_SELF
2019-07-30 19:40:28 +02:00
Vaadasch
1600ecc9ec
Change 0 and 1 to FALSE and TRUE for pgsql
...
0 and 1 are read as False and True by Mysql, but not by PGsql.
FALSE and TRUE are correctly read by both => changing
2019-07-30 19:35:03 +02:00
Alexandre SPANGARO
b146004966
Fix travis
2019-07-30 11:06:40 +02:00
Alexandre SPANGARO
8228979e67
Fix travis
2019-07-30 09:18:18 +02:00
Laurent Destailleur
ecc0b4ed32
Add prefixsession in event table
2019-07-29 02:16:21 +02:00
Alexandre SPANGARO
3e69421ec3
Fix travis
2019-07-28 07:33:57 +02:00
ATM john
581ae226ff
Fix sellist showOuputField
2019-07-27 18:25:25 +02:00
Maxime Kohlhaas
5c2763d0dd
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_choose_lines_from_origin
2019-07-27 10:53:43 +02:00
Alexandre SPANGARO
83e2f71e07
Fix travis
2019-07-27 07:56:33 +02:00
Alexandre SPANGARO
053ae8224b
NEW Box use fiscal year (Thanks Yves57)
2019-07-27 06:36:39 +02:00
Laurent Destailleur
9f7d118f6f
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-27 02:40:56 +02:00
Nicolas ZABOURI
3bdbbc7147
NEW list of boxes area
2019-07-26 17:17:59 +02:00
Laurent Destailleur
1ca3c6e3ae
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-07-26 13:17:47 +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
111c0dcadd
Comment
2019-07-25 17:46:48 +02:00
Laurent Destailleur
389976699c
Fix responsive
2019-07-24 16:29:50 +02:00
Laurent Destailleur
9ddb8a5b0b
Fix tooltip to say closed project are not visibles
2019-07-23 14:41:29 +02:00
Laurent Destailleur
59555d00ff
Merge pull request #11531 from BadPixxel/patch-5
...
FIX: Units Scale Missing in Object CRUD
2019-07-22 18:31:43 +02:00
Regis Houssin
6409cc06ae
FIX duplicate on the check (TODO field $onetrtd not used ?)
2019-07-22 11:44:56 +02:00
Alexandre SPANGARO
2c74caff90
WIP
2019-07-22 06:56:55 +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
Laurent Destailleur
20e58bdd97
FIX Limit of uploaded files (max_post_size was not used)
2019-07-20 13:09:25 +02:00
Laurent Destailleur
9f9598ac99
FIX missing token
2019-07-20 11:44:54 +02:00
Laurent Destailleur
e85c2202e8
FIX missing token
2019-07-20 11:44:31 +02:00
Laurent Destailleur
de4142e23e
FIX Add message from public interface
2019-07-19 23:57:35 +02:00
Laurent Destailleur
ec34ce1e64
Maxi debug of module ticket
2019-07-19 23:11:00 +02:00
Laurent Destailleur
48b4aa4c8d
Fix link to ticket
2019-07-19 18:29:33 +02:00
Laurent Destailleur
73af3542d1
FIX the feature to bill time spent was not enabled.
2019-07-19 16:18:14 +02:00
Laurent Destailleur
f745d01bf3
Prepare change of properties "titre" into "title"
2019-07-19 13:22:54 +02:00
BadPixxel
b88d19e8e4
FIX: Units Scale Missing in Object CRUD
2019-07-19 12:24:53 +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
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
Laurent Destailleur
5e204f0f67
Merge
2019-07-18 17:51:32 +02:00
Laurent Destailleur
b044d95acf
Merge
2019-07-18 17:50:15 +02:00
Christophe Battarel
aab23a1531
FIX : do not return formatted prices in json string
2019-07-16 17:50:43 +02: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
4dabdfa5ac
Merge pull request #11483 from inoveaconseil/FIX_update_price
...
FIX element name in update_price
2019-07-13 23:30:17 +03:00
Laurent Destailleur
f041110a7e
Update commonobject.class.php
2019-07-13 22:29:50 +02:00
Laurent Destailleur
b1e21ed5fc
FIX Computed field were not calculated into lists.
2019-07-11 22:18:44 +02:00
Nicolas ZABOURI
abd0abf115
FIX element name in update_price
2019-07-10 18:36:12 +02:00
Regis Houssin
41b004c2b8
FIX better compatibility with multicompany transverse mode
2019-07-10 12:16:32 +02:00
Laurent Destailleur
e5d34de877
FIX compatibility mysql 8. rank is reserved
...
FIX Permission for BOM menu
2019-07-09 00:14:01 +02:00
Maxime Kohlhaas
9c47cb6f91
NEW : can choose lines while creating order from origin
2019-07-08 23:16:32 +02:00
Laurent Destailleur
4387d40b9a
Translation lignes -> lines
2019-07-05 21:55:08 +02:00
Laurent Destailleur
709b738d75
Fix regression
2019-07-05 18:54:51 +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
e3359c6f0f
FIX Can't submit a ticket from public interface
2019-07-05 11:21:04 +02:00
Laurent Destailleur
1c33dd2e75
Merge pull request #11436 from fbosman/fbosman-patch-1
...
Feature request: Extrafields - store computed value #11435
2019-07-04 16:23:08 +02:00
Laurent Destailleur
35bce50a1d
Merge pull request #11455 from atm-florianm/FIX_add_hook_to_fileupload_to_enable_modules_to_override_upload_options
...
NEW: Add hook on fileupload.class.php to enable modules to override…
2019-07-04 12:50:21 +02:00
Laurent Destailleur
63c93be94e
Update html.form.class.php
2019-07-04 12:20:34 +02:00
atm-florian.m
cf458c77dc
FIX: hook added on fileupload.class.php to enable modules to override upload options
2019-07-04 12:04:39 +02:00
Laurent Destailleur
27ba3408b4
Fix code comment
2019-07-04 02:01:55 +02:00
atm-greg
2f5b9ccb22
fix case objecttmp is an invoice
2019-07-03 17:00:18 +02:00
Frans Bosman
cd7d4de6ec
Update commonobject.class.php
2019-07-03 16:53:26 +02:00
Frans Bosman
116c6d7a6a
Update commonobject.class.php
2019-07-03 11:09:24 +02:00
Frans Bosman
9064737930
Update commonobject.class.php
2019-07-03 07:08:53 +02:00
Frans Bosman
221c202add
Update commonobject.class.php
2019-07-03 06:59:52 +02:00
fbosman
3e91fdda77
Update commonobject.class.php
2019-07-01 12:34:27 +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
adb3062a9f
Work on nblignes -> nblines
2019-06-29 16:38:14 +02:00
Laurent Destailleur
d71330c00b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-29 02:04:16 +02:00
Laurent Destailleur
36e240a16d
NEW Add statistics on product into contracts
2019-06-29 02:03:57 +02:00
Laurent Destailleur
ff7ae5ef20
Update extrafields.class.php
2019-06-28 12:56:31 +02:00
fbosman
f44203775a
Update extrafields.class.php
2019-06-28 07:10:28 +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
Laurent Destailleur
51a1550dbb
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
2019-06-25 23:14:49 +02:00
Laurent Destailleur
70967b4ea1
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/class/utils.class.php
2019-06-25 20:06:39 +02:00
Laurent Destailleur
d41850c7cd
Fix purge of old files
2019-06-25 20:02:14 +02:00
Laurent Destailleur
4696d35bcb
Fix we need to keep temp dir
2019-06-25 19:02:24 +02:00
Laurent Destailleur
f984a77044
FIX Fallback on main language for alternative languages
2019-06-25 14:05:10 +02:00
Laurent Destailleur
fffdd8797d
FIX Fallback on main language for alternative languages
2019-06-25 14:04:34 +02:00
Laurent Destailleur
fa476b4994
Properties ->libelle_incoterms were renamed into ->label_incoterms
2019-06-25 13:00:02 +02:00
Laurent Destailleur
a7bd734ece
Rename ->produit into ->product. Still permissions to rename.
2019-06-24 21:18:49 +02:00
Laurent Destailleur
2a3b4c3fd7
Merge pull request #11111 from OPEN-DSI/new-extrafields-separator-collapse
...
NEW add extrafield separator collapsing capabilities
2019-06-24 19:04:51 +02:00
Laurent Destailleur
604633afd1
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-24 18:45:15 +02:00
Laurent Destailleur
31ffa6bc69
FIX #11218 #11150
2019-06-24 18:43:16 +02:00
Laurent Destailleur
28deca7100
FIX #11218 #11150
2019-06-24 18:40:31 +02:00
Laurent Destailleur
609eefaf08
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_massactions.inc.php
2019-06-24 16:36:08 +02:00
Laurent Destailleur
28024d5cd1
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
2019-06-24 16:28:48 +02:00
Laurent Destailleur
84575df7e6
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-06-24 16:12:29 +02:00
Laurent Destailleur
3d185b6818
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/core/actions_massactions.inc.php
htdocs/core/tpl/massactions_pre.tpl.php
2019-06-24 16:12:20 +02:00
Laurent Destailleur
3c4956838e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/tpl/massactions_pre.tpl.php
2019-06-24 15:44:44 +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
7b6925b8f7
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
2019-06-24 10:29:43 +02:00
Laurent Destailleur
9c54de57ce
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-23 18:12:56 +02:00
Laurent Destailleur
1c48b8be32
Fix code comment
2019-06-23 17:23:41 +02:00
Laurent Destailleur
efa09301b1
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-22 20:19:14 +02:00
Laurent Destailleur
8a9c858609
Code comment
2019-06-22 20:18:55 +02:00
Laurent Destailleur
b202c7eaa0
Fix confusion between ->childs and ->childsoncascade
2019-06-22 20:17:40 +02:00
Laurent Destailleur
5c3d3cec9e
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-22 18:44:12 +02:00
Laurent Destailleur
662afe8a36
Fix missing global
2019-06-22 18:24:29 +02:00
Laurent Destailleur
5675e7c50e
Clean code of deprecated method
2019-06-22 18:19:40 +02:00
Laurent Destailleur
eb20df8e64
Fix debug save of state into setup
2019-06-22 14:47:46 +02:00
Laurent Destailleur
403d41ec30
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-22 11:55:33 +02:00
Laurent Destailleur
c63b465d48
Fix doxygen
2019-06-21 14:34:04 +02:00
Bahfir Abbes
7f34a03034
It's just a mistake. In order to declare a getnomUrl method, Ccountry does not need to extend Commonobject
2019-06-20 20:55:48 +01:00
Laurent Destailleur
bb9b0d401e
Fix phpcs
2019-06-20 13:56:20 +02:00
florian HENRY
0865bdb60f
fix depending extrafeilds list
2019-06-20 12:16:48 +02:00
John Botella
b21006614c
Fix substitutions null
2019-06-20 12:00:44 +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
554724a46f
Merge pull request #11363 from aspangaro/10.0_other
...
Translate rights
2019-06-20 03:36:16 +02:00
Laurent Destailleur
2c0d43a27a
Merge pull request #11372 from bafbes/abb90059
...
New:Show c_country elements in modulebuilder
2019-06-20 03:32:53 +02:00
Laurent Destailleur
2b0b7b0dab
Update ccountry.class.php
2019-06-20 03:32:28 +02:00
Laurent Destailleur
13200a4d51
Merge pull request #11350 from frederic34/patch-7
...
NEW can specify hour start end for selectDate and step for minutes
2019-06-20 03:24:23 +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
04f2fb604f
Fix duplicate 'option_' in prefix
2019-06-19 15:48:37 +02:00
Laurent Destailleur
2034faf280
Fix duplicate 'option_' in prefix
2019-06-19 15:48:04 +02:00
Abbes Bahfir
c109eebe38
New:Show c_country elements in modulebuilder
2019-06-19 14:43:18 +01:00
Abbes Bahfir
695a00f21c
New:Show labels of countries in modulebuilder
2019-06-19 14:04:18 +01:00
Laurent Destailleur
f9cc120d75
Debug module ticket
2019-06-19 12:53:28 +02:00
Alexandre SPANGARO
c59de49894
Translate rights
2019-06-18 22:38: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
a74eaaff4d
Fix sort of linked elements
2019-06-17 15:54:54 +02:00
Frédéric FRANCE
1a1f3493c9
NEW can specify hour start end for selectDate and step for minutes
2019-06-17 14:03:57 +02:00
Laurent Destailleur
8330078de1
Fix default value
2019-06-17 12:33:09 +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
5cada6ee0b
Merge pull request #11336 from ptibogxiv/patch-186
...
Fix measuring_units_string display function
2019-06-14 13:48:31 +02:00
Laurent Destailleur
e8b139d1c6
Fix repeated logs and fetch
2019-06-13 22:48:31 +02:00
Laurent Destailleur
f00c9a10db
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
2019-06-13 12:15:51 +02:00
Laurent Destailleur
52159dcb69
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/class/html.formother.class.php
2019-06-13 12:14:19 +02:00
Laurent Destailleur
3e6b7208cc
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-06-13 12:12:37 +02:00
Laurent Destailleur
319bc7ec8a
Fix syntax error
2019-06-13 12:12:20 +02:00
Laurent Destailleur
4b1f0d1ac2
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/class/html.formother.class.php
2019-06-13 12:11:31 +02:00
Laurent Destailleur
b6f477fc83
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-06-13 12:07:24 +02:00
Laurent Destailleur
4b26702516
code comment
2019-06-13 11:07:38 +02:00
Laurent Destailleur
4cbfb67d63
Update html.formother.class.php
2019-06-13 09:59:10 +02:00
Laurent Destailleur
e81663ec34
Fix cropping of image files for BOM module was ko
2019-06-12 19:00:34 +02:00
atm-greg
47746fd17d
fix template type
2019-06-12 12:30:49 +02:00
Laurent Destailleur
4c44378049
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-07 16:56:39 +02:00
florian HENRY
3927a74d6b
fix scrunitizer
2019-06-05 16:30:22 +02:00
florian HENRY
1cf38fa635
fix scrutinizer
2019-06-05 16:08:04 +02:00
Laurent Destailleur
1229f64632
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-04 19:04:33 +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
79a3e41418
Hook 'getAccessForbiddenMessage'
2019-06-04 12:48:06 +02:00
Laurent Destailleur
664e0b81d8
Debug module BOM
2019-06-03 22:07:34 +02:00
Laurent Destailleur
b526f7da43
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-03 20:47:12 +02:00
Laurent Destailleur
a143dba9f8
Work on incomplete code on BOM module
2019-06-03 20:46:11 +02:00
Laurent Destailleur
7d2cedfdcf
Debug bom module
2019-06-03 19:29:49 +02:00
Laurent Destailleur
72f55e1d81
Debug modulebuilder
2019-06-03 18:11:53 +02:00
Regis Houssin
5726b40a10
FIX try to use WHERE EXISTS instead DISTINCT
2019-06-03 17:26:03 +02:00
Regis Houssin
7fd1051efc
FIX missing compatibility with multicompany transverse mode
...
Conflicts:
htdocs/core/class/html.formother.class.php
2019-06-03 17:22:15 +02:00
Laurent Destailleur
213936aac1
Fix combo
2019-06-03 16:20:04 +02:00
Regis Houssin
38246b4088
NEW add new function "setEntity()"
2019-06-03 11:13:26 +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
d8adda82f9
Merge pull request #11291 from AXeL-dev/patch-9
...
Fix #11256
2019-06-02 12:23:27 +02:00
Laurent Destailleur
5f0fbcea9a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/contact/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
2019-06-02 11:49:33 +02:00
AXeL-dev
82b37a514c
Fixed empty verification (0 might be considered as empty also, so its better to compare string value with '')
2019-06-01 16:27:06 +00:00
AXeL-dev
d2c853c47b
Fix #11256
2019-06-01 15:00:15 +00:00
Laurent Destailleur
f2088a084f
Fix error management
2019-05-31 11:53:30 +02:00
Laurent Destailleur
cd75794aaa
FIX #11169 #11202
2019-05-31 11:38:54 +02:00
Laurent Destailleur
912e29a746
FIX #11244
2019-05-29 11:06:01 +02:00
Laurent Destailleur
3c05cfe690
Fix useless test
2019-05-29 10:50:33 +02:00
Laurent Destailleur
b46b675b7c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-05-29 10:36:00 +02:00
Laurent Destailleur
a491de01b3
Merge pull request #11244 from altatof/8.0
...
FIX : do not include tpl from disabled modules
2019-05-29 10:35:39 +02:00
Laurent Destailleur
1c3f519b1a
Remove warnings
2019-05-28 12:54:35 +02:00
Laurent Destailleur
15de8a9497
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/mailing/card.php
2019-05-27 19:25:53 +02:00
Laurent Destailleur
1c6ddd25c4
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-05-27 19:23:54 +02:00
Laurent Destailleur
7db643fff0
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-05-27 19:23:09 +02:00
Laurent Destailleur
93c395fe10
FIX confirmation of mass email sending + option MAILING_NO_USING_PHPMAIL
2019-05-27 19:22:51 +02:00
Laurent Destailleur
a138c05457
Fix colspan
2019-05-27 13:28:10 +02:00
Laurent Destailleur
b81c3a6d2b
Fix look and feel v10
2019-05-26 18:23:30 +02:00
Christophe Battarel
83d883c36a
finally eldy is always right
2019-05-24 15:14:34 +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
Christophe Battarel
545cdd0762
test include return on FALSE
2019-05-24 12:54:24 +02:00
Christophe Battarel
abc7c2f0f8
test include return on TRUE
2019-05-24 12:33:40 +02:00
Christophe Battarel
aaaad71347
FIX : do not include disabled modules tpl
2019-05-24 12:10:58 +02:00
Laurent Destailleur
43e098caae
Fix phpcs
2019-05-23 12:35:53 +02:00
Laurent Destailleur
111239094a
Work to finish module BOM for v10
2019-05-22 20:28:24 +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
f99f1d83c2
Merge pull request #11229 from frederic34/patch-7
...
target _blank depend of mime
2019-05-21 22:42:36 +02:00
Laurent Destailleur
5707aff7c4
Look and feel v10
2019-05-21 21:52:04 +02:00
Laurent Destailleur
fdeb12a909
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/mailing/card.php
2019-05-21 21:18:40 +02:00
Laurent Destailleur
a7f5f3fb94
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-05-21 21:16:54 +02:00
Laurent Destailleur
dcf77520ea
FIX Error management when MAILING_NO_USING_PHPMAIL is set
2019-05-21 21:16:06 +02:00
Laurent Destailleur
22e897b1a1
Clean and prepare code to fix a SQL injection
2019-05-21 17:22:38 +02:00
Frédéric FRANCE
84781cabac
target _blank depend of mime
...
target _blank is added in the previous line depending on mimtype
2019-05-21 13:11:17 +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
ae3605d82d
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/pdf.php
htdocs/core/class/extrafields.class.php
2019-05-20 15:47:06 +02:00
Laurent Destailleur
ebf252f8a3
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-05-20 15:40:50 +02:00
Laurent Destailleur
c3732f2b7a
Fix edition of margins in recurring invoices
2019-05-20 14:41:47 +02:00
Laurent Destailleur
27ed095181
Debug BOM module
2019-05-19 16:40:25 +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
florian HENRY
e4d87ab2e7
fix : #11189
2019-05-19 02:05:13 +02:00
Maxime Kohlhaas
6c195d7bdf
Add warning delay for holidays
2019-05-18 17:07:29 +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
florian HENRY
9ef5767fd5
phpcs
2019-05-18 12:28:39 +02:00
florian HENRY
730820bb26
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2019-05-18 12:11:48 +02:00
florian HENRY
02af7ca25e
fix pb with multicompny payment dictionnary on faxcture card
2019-05-18 12:11:28 +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
6c4a4c34c4
Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
2019-05-18 02:26:40 +02:00
Laurent Destailleur
c1ec7454a1
Merge branch 'develop' into clean_10_beta
2019-05-16 21:21:51 +02:00
Laurent Destailleur
d1e5c525aa
Fix warning
2019-05-16 14:47:42 +02:00
Francis Appels
6e5d826d65
Clean PHPCS for commonobject.class
2019-05-13 22:02:33 +02:00
atm-greg
644f247910
fix useless calculation
2019-05-13 12:02:46 +02:00
Regis Houssin
3cb6ca34e9
FIX multicompany compatibility
2019-05-12 16:06:16 +02:00
Regis Houssin
b73df2698d
FIX better compatibility with Multicompany
2019-05-12 14:25:41 +02:00
Laurent Destailleur
a664cd6461
Fix check when uploading a non image as user photo
2019-05-10 20:09:41 +02:00
Laurent Destailleur
cc64e3e5c0
Fix responsive
2019-05-10 19:38:08 +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
Laurent Destailleur
069df82380
FIX javascript error when ckeditor module not enabled
2019-05-10 17:40:34 +02:00
Laurent Destailleur
6e69db8a1a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/product/doc/pdf_standard.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
htdocs/filefunc.inc.php
2019-05-09 12:27:14 +02:00
atm-arnaud
4c90ba1a64
FIX attached files list with link file was broked
2019-05-09 12:11:18 +02:00
Laurent Destailleur
c2abedeb24
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 9.0
2019-05-08 21:43:57 +02:00
Laurent Destailleur
590b1d1e90
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
2019-05-08 18:24:50 +02:00
Laurent Destailleur
f2e24ed96e
Fix bad contact used
2019-05-08 18:20:28 +02:00
Laurent Destailleur
3a3b04f31b
Fix showdocument for external modules
2019-05-08 17:31:50 +02:00
Laurent Destailleur
b58a73cfaf
Merge pull request #11139 from code-chicken/patch-1
...
FIX Add support for units
2019-05-08 02:02:22 +02:00
Laurent Destailleur
2ee72e2fdf
Update html.form.class.php
2019-05-08 02:02:07 +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
Laurent Destailleur
c4798c34b0
Fix autocompletion of product on stock correction
2019-05-07 00:26:31 +02:00
Rüdiger Hahn
4008e26328
Add support for units
...
Fetch units from db when they've been enabled in configuration
2019-05-06 13:12:41 +02:00
Lionel VESSILLER
87e83a7967
New add extrafield separator collapse with theses specific values
...
- empty for a simple separator
- 1 to extend by default all extrafields after the separator position
- 2 to collapse by default all extrafields after the separator position
2019-05-03 16:14:44 +02:00
Laurent Destailleur
8442c86436
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formmail.class.php
htdocs/core/lib/functions.lib.php
htdocs/index.php
2019-05-02 17:40:41 +02:00
Laurent Destailleur
8d7f24a6d9
FIX Default value on form to send email
2019-05-02 15:34:29 +02:00
Laurent Destailleur
e81f10c790
Debug hidden option MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION
2019-05-02 13:45:49 +02:00
Laurent Destailleur
86f5889a72
Merge pull request #11078 from Supermanu/help_extrafields
...
Show help text for extrafields in forms
2019-05-02 12:36:15 +02:00
Laurent Destailleur
9955af5194
Debug ticket module
2019-05-01 17:53:41 +02:00
Laurent Destailleur
a75c6a81d1
FIX Follow rule to create a new page
2019-05-01 17:15:42 +02:00
Laurent Destailleur
61bf731d17
FIX Balance of td
2019-04-30 18:11:35 +02:00
Laurent Destailleur
9c45b781af
Fix balance of colspan
2019-04-30 16:44:11 +02:00
Laurent Destailleur
3007905508
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formmail.class.php
htdocs/core/modules/modProduct.class.php
htdocs/core/modules/modService.class.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/core/tpl/objectline_edit.tpl.php
htdocs/stripe/class/stripe.class.php
2019-04-30 03:30:40 +02:00
Supermanu
bbc6c0fe0c
Show help text for extrafields in forms
2019-04-29 20:18:47 +02:00
Laurent Destailleur
627ef14454
FIX The autocopy feature was ko for suppliers
2019-04-29 18:51:15 +02:00
Laurent Destailleur
5253c759af
Fix overwrite feature
2019-04-27 21:42:52 +02:00
Laurent Destailleur
410a3801da
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2019-04-27 13:27:52 +02:00
Laurent Destailleur
4bd732cc40
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/export.php
htdocs/core/class/utils.class.php
htdocs/langs/en_US/website.lang
2019-04-25 23:25:21 +02:00
Laurent Destailleur
01075081cb
FIX CVE-2019-11200
2019-04-25 22:25:19 +02:00
gauthier
31897f54ac
Fix prev situation invoice selection (backport fix 8.0)
2019-04-25 12:37:05 +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
Laurent Destailleur
e5c2027dbb
NEW Add accounting code for eec sales and export sales on products
2019-04-25 01:16:29 +02:00
Laurent Destailleur
8aa8efcb14
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-04-24 11:25:23 +02:00
Laurent Destailleur
99639ef429
FIX #11013
2019-04-24 11:25:14 +02:00
Laurent Destailleur
f0bb9288bf
FIX #11013
2019-04-24 11:23:49 +02:00
Laurent Destailleur
4421dedbd2
Merge pull request #11008 from aspangaro/10.0_closure
...
FIX: Update blocked by datec on fiscal year
2019-04-24 10:28:23 +02:00
Laurent Destailleur
633eb1d6c6
Remove warning
2019-04-23 13:28:42 +02:00
Laurent Destailleur
6da42941a8
NEW Add attached document on bank account visible in automatic ECM.
2019-04-21 19:54:30 +02:00
ATM john
292d9c38a5
Appli function to links
2019-04-15 00:21:58 +02:00
Alexandre SPANGARO
c1ecfae6f2
FIX: Update on fiscal year
2019-04-13 22:46:40 +02:00
Laurent Destailleur
8e9a4e1877
Fix output of fields with type "real"
2019-04-13 10:42:43 +02:00
Laurent Destailleur
ebe8f27c16
Fix on smartphone
2019-04-13 10:29:09 +02:00
atm-quentin
6deba39c6a
FIX credit note can be split
2019-04-12 10:16:13 +02:00
Lionel VESSILLER
09ce5bd977
Fix dropdown menu in pages with several lists
2019-04-11 17:59:11 +02:00
Laurent Destailleur
ac25003d33
Dolibarize module ticket
2019-04-10 11:39:54 +02:00
Laurent Destailleur
861c1b412c
CSS
2019-04-09 19:23:34 +02:00
Laurent Destailleur
7790140f22
CSS
2019-04-09 14:13:34 +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
d01b54ca5b
Fix phpcs
2019-04-08 18:02:27 +02:00
Laurent Destailleur
1274d71a10
Fix phpcs
2019-04-08 16:00:01 +02:00
Laurent Destailleur
976ef92df6
Merge pull request #10958 from atm-john/new_look_and_feel_pdf
...
New pdf document column system : supplier order and expedition
2019-04-08 13:31:47 +02:00
Laurent Destailleur
da6c5b552f
Merge pull request #10950 from OPEN-DSI/new-extrafield-sellist-chkbxlst-options
...
New categories options in sellist and chbxlist extrafields
2019-04-08 13:28:51 +02:00
Laurent Destailleur
7b85a7977b
Update html.form.class.php
2019-04-08 13:28:32 +02:00
Laurent Destailleur
22ca858b36
Enhance setup of email collector
2019-04-07 18:32:01 +02:00
Laurent Destailleur
1ffb5a72d5
Replace image with font awesome
2019-04-05 14:45:54 +02:00
Christophe Battarel
f167ad910e
camelCase and generic cloneCategories function
2019-04-05 11:30:51 +02:00
Laurent Destailleur
fff9b7db9d
Fix doxygen
2019-04-04 18:33:12 +02:00
John BOTELLA
a668cc28b1
Add table title auto height
2019-04-03 16:19:49 +02:00
Laurent Destailleur
eb6bd20132
Fix error message
2019-04-03 16:16:51 +02:00
Lionel VESSILLER
8a220b9da1
New categories options in sellist and chbxlist extrafields
2019-04-02 11:01:46 +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
0c051e0cf0
Merge pull request #10923 from ptibogxiv/patch-145
...
NEW automatic / manual selector form
2019-04-01 18:44:05 +02:00
Laurent Destailleur
c07159fee9
Fix regression in timesheet. Keep extrafield of task for the moment.
2019-03-31 22:06:41 +02:00
ptibogxiv
69b04e2189
Update html.formother.class.php
2019-03-31 19:28:45 +02:00
ptibogxiv
13c93ba1c2
transfert from html.form.class.php
2019-03-31 19:26:40 +02:00
ptibogxiv
1a228ed95c
transfert to html.otherform.class.php
2019-03-31 19:25:45 +02:00
Laurent Destailleur
ecd049b4e6
Debug dolistore
2019-03-31 13:39:51 +02:00
ptibogxiv
2cc9b61a9f
Update html.form.class.php
2019-03-27 11:10:30 +01:00
Laurent Destailleur
d8212d84df
Debug emailcollector
2019-03-26 19:15:18 +01:00
Laurent Destailleur
9eaef2ce7a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/export.php
htdocs/langs/en_US/admin.lang
2019-03-26 12:40:36 +01:00
Laurent Destailleur
524f171168
FIX old export models was not visible
2019-03-26 12:12:16 +01:00
Laurent Destailleur
f27f65e8bf
Responsive
2019-03-25 10:09:02 +01:00
Laurent Destailleur
82381533dd
Better responsive
2019-03-25 09:14:28 +01:00
Laurent Destailleur
5ff76e2c13
WIP file attachment on expense report lines
2019-03-24 12:15:19 +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
c569e71bc8
Fix remove warnings
2019-03-23 12:04:50 +01:00
Laurent Destailleur
d79d5d5a23
Fix var name not defined
2019-03-22 13:20:37 +01:00
Laurent Destailleur
52d3e89276
FIX function not found
2019-03-22 12:21:31 +01:00
Laurent Destailleur
a92ff42be8
FIX function not found
2019-03-22 12:12:42 +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
aa33e4fd2a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-03-21 18:26:29 +01:00
Laurent Destailleur
55d64d441f
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-03-21 18:26:02 +01:00
Philippe GRAND
7988481688
add some comments
2019-03-21 15:06:14 +01:00
Philippe GRAND
96893315b5
add some comments
2019-03-21 15:03:01 +01:00
Frédéric FRANCE
d10b94e72b
Update extrafields.class.php
2019-03-21 14:08:49 +01:00
Laurent Destailleur
a1fe1bb58c
FIX when 2 extra fields are mandatory in 2 different entities
2019-03-21 12:33:39 +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
Laurent Destailleur
a7fdd34973
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-03-21 12:17:50 +01:00
Laurent Destailleur
032aa869e4
FIX Can't insert if there is extrafields mandatory on another entity.
...
FIX Can't set default value of extrafield of type varchar
2019-03-21 12:14:15 +01:00
Laurent Destailleur
4c85068a85
FIX Can't insert if there is extrafields mandatory on another entity.
2019-03-21 11:53:04 +01:00
atm-greg
a8cdb63a25
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into Hook_on_commonGenerateDocument
2019-03-20 06:49:36 +01:00
Laurent Destailleur
51eab7e2f8
Fix rename tag
2019-03-19 15:21:07 +01:00
Laurent Destailleur
9745bd1f16
NEW Add tag for ODT generation for localtax rates
2019-03-19 15:18:43 +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
Regis Houssin
57091f08b0
FIX missing entity filter and wrong var name
2019-03-18 10:53:43 +01:00
Laurent Destailleur
b3dc6d7d1d
NEW Generation of doc by modulebuilder can include README and CHANGELOG
2019-03-17 19:33:25 +01:00
Laurent Destailleur
39b9ca2397
Work on documentation generation by modulebuilder
2019-03-17 15:45:50 +01:00
Laurent Destailleur
d44be341a5
NEW Add property 'noteditable' in modulebuilder
2019-03-17 01:45:46 +01:00
Laurent Destailleur
95c1275efc
Fix phpcs
2019-03-16 20:10:22 +01:00
Laurent Destailleur
e5567c7ee4
Fix typo
2019-03-16 14:48:41 +01:00
Laurent Destailleur
7a5a561170
Fix label of status of invoice record when using smartphone
2019-03-15 23:00:50 +01:00
Laurent Destailleur
a1adcc785c
Clean code
2019-03-15 19:11:24 +01:00
Laurent Destailleur
a2d6723ff3
WIP Link files to expense report lines
2019-03-15 15:07:52 +01:00
Laurent Destailleur
86c5dc20e3
NEW Can choose the root category to show for TakePOS module
2019-03-15 02:12:40 +01:00
