Laurent Destailleur
64ebc665c7
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-20 23:32:59 +02:00
Laurent Destailleur
de11fb2783
Fix phpcs
2020-05-20 23:32:13 +02:00
Laurent Destailleur
482da404f0
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-20 23:30:02 +02:00
Laurent Destailleur
7d6cf4c01a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/projet/class/project.class.php
2020-05-20 23:27:45 +02:00
Laurent Destailleur
650bddde0d
Fix phpcs
2020-05-20 23:25:10 +02:00
Laurent Destailleur
e1e5d12524
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-20 23:23:17 +02:00
Laurent Destailleur
e42fb1b57d
Fix trigger name
2020-05-20 23:15:56 +02:00
Laurent Destailleur
c4d1db263c
Fix end of workflow of MO
2020-05-20 23:15:18 +02:00
Laurent Destailleur
d66f54d06d
Clean home page
2020-05-20 22:45:43 +02:00
Frédéric FRANCE
e7714acc77
Update paymentloan.class.php
...
same picto in loan
2020-05-20 20:19:00 +02:00
Frédéric FRANCE
16cc946608
Update datapolicycron.class.php
2020-05-20 20:13:42 +02:00
Laurent Destailleur
954d928467
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-20 20:11:13 +02:00
Laurent Destailleur
cce72ad8d6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/tpl/objectline_title.tpl.php
htdocs/langs/en_US/bills.lang
htdocs/projet/class/project.class.php
2020-05-20 20:10:48 +02:00
Laurent Destailleur
6f52c62f2a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/install/mysql/migration/repair.sql
htdocs/langs/en_US/bills.lang
2020-05-20 19:53:28 +02:00
Laurent Destailleur
434341316b
suggest some fix to debug situation invoices
2020-05-20 19:51:04 +02:00
Frédéric FRANCE
365f85dcea
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-20 18:28:55 +02:00
Anthony Berton
aa275f2a79
Delete html.form.class.php
2020-05-20 14:58:01 +02:00
Anthony Berton
f32767239b
Merge branch 'PRODUCT_PRICE_BASE_TYPE' of https://github.com/bb2a/dolibarr into PRODUCT_PRICE_BASE_TYPE
2020-05-20 14:50:45 +02:00
Anthony Berton
15805562d1
Update html.form.class.php
2020-05-20 14:50:40 +02:00
altairis
55def0248c
fix missing rollbacks
2020-05-20 14:37:35 +02:00
Laurent Destailleur
3b7f3cf76a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-20 13:20:12 +02:00
Laurent Destailleur
00f189c921
Introduce button to allow migration of files from old version at once
2020-05-20 13:19:32 +02:00
Laurent Destailleur
88c939562e
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-20 12:39:01 +02:00
Laurent Destailleur
66df82f9e0
Better management of absolute url for canonical link tag
2020-05-20 12:38:38 +02:00
Laurent Destailleur
2f7786f50f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-20 10:37:43 +02:00
Laurent Destailleur
51ed77fbf7
Fix
2020-05-20 09:59:01 +02:00
Laurent Destailleur
c5e341883d
Fix popup of supplier invoice
2020-05-19 23:22:40 +02:00
Laurent Destailleur
18ec65b4af
Fix: action on an ID must not include test on entity.
2020-05-19 22:06:17 +02:00
Laurent Destailleur
2ba9d7f288
Fix translation
2020-05-19 21:38:42 +02:00
Frédéric FRANCE
cd240efadf
Update entrepot.class.php
2020-05-19 21:28:47 +02:00
stickler-ci
0ac82797e7
Fixing style errors.
2020-05-19 19:14:20 +00:00
Frédéric FRANCE
f2ac1992cd
Merge branch 'develop' into entrepotlibelle
2020-05-19 21:13:33 +02:00
Frédéric FRANCE
fd7a5473a7
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-19 21:08:15 +02:00
Laurent Destailleur
346082b153
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-19 19:59:24 +02:00
Laurent Destailleur
00d7947ee8
Fix link replaced twice
2020-05-19 19:55:28 +02:00
atm-lena
bf9756b8c4
Add Hook "Massstockmove"
2020-05-19 16:05:13 +02:00
altairis
80c56b3017
manage stock on edit and delete dispatched lines
2020-05-19 15:59:03 +02:00
atm-lena
e042807b32
Add $this to parameters
2020-05-19 15:58:16 +02:00
gauthier
f3582d891a
FIX : We must only rename current bank receipt
2020-05-19 15:35:37 +02:00
atm-lena
3f28c9a461
Add parameters to hook
2020-05-19 15:31:37 +02:00
atm-lena
987fb806c6
Exclude array param
2020-05-19 15:24:53 +02:00
Anthony Berton
702627155c
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE
2020-05-19 15:20:18 +02:00
atm-lena
f518bafda9
11.0 - Add Hook "SelectWarehouses"
2020-05-19 15:17:06 +02:00
altairis
b79a30c0f9
edit and delete dispatched lines
2020-05-19 14:18:06 +02:00
atm-quentin
d61cef28d7
NEW conf to allow show full arbo in getnomurl
2020-05-19 11:16:04 +02:00
altairis
24ff047ad7
add tracking number
2020-05-19 10:34:55 +02:00
atm-quentin
e39774a508
add more hook param
2020-05-19 10:05:26 +02:00
atm-quentin
f073b7023a
FIX missing GetNomURL Hook in warehouse class
2020-05-19 09:52:33 +02:00
Alexandre SPANGARO
1f46c57c0b
NEW Add employee in expense report binding page
2020-05-19 09:36:07 +02:00
stickler-ci
f0bb7d233f
Fixing style errors.
2020-05-19 06:29:23 +00:00
Tobias Sekan
0cba74277a
Update agenda.lang
2020-05-19 08:19:14 +02:00
Tobias Sekan
7fd6151c43
Add massactions for event list
2020-05-19 08:18:38 +02:00
Tobias Sekan
223224d12c
Add function to update the event percent + const
2020-05-19 08:07:21 +02:00
Laurent Destailleur
2d0abebca3
CSS
2020-05-19 04:40:08 +02:00
Laurent Destailleur
b3a17c8da4
Look and feel v12
2020-05-19 04:21:38 +02:00
Laurent Destailleur
3e187f8ce0
Fix add check on size limit
2020-05-19 03:36:29 +02:00
Laurent Destailleur
d35a24ee76
Removed not expected file
2020-05-19 01:36:33 +02:00
Laurent Destailleur
d89c9abcb6
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-19 00:53:01 +02:00
Laurent Destailleur
7b29ce036a
Fix input of virtual host and canonical url
2020-05-19 00:50:30 +02:00
Frédéric FRANCE
3e3cb05a57
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-18 22:43:41 +02:00
Laurent Destailleur
9f9dfb94f0
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-18 22:40:52 +02:00
Laurent Destailleur
76663ae3e8
Fix canonical tag
2020-05-18 22:40:32 +02:00
Frédéric FRANCE
b6462462d7
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-18 22:27:32 +02:00
Laurent Destailleur
88c40633d5
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-18 15:57:29 +02:00
Laurent Destailleur
ff8d22a80d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/expedition/class/expedition.class.php
scripts/cron/cron_run_jobs.php
2020-05-18 15:57:01 +02:00
Laurent Destailleur
82a8c42441
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-05-18 15:54:47 +02:00
Laurent Destailleur
9336828710
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
htdocs/compta/paiement/card.php
htdocs/expedition/class/expedition.class.php
2020-05-18 15:54:39 +02:00
Laurent Destailleur
6d62e92e12
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-05-18 15:50:42 +02:00
Laurent Destailleur
45345440a4
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/expedition/class/expedition.class.php
scripts/cron/cron_run_jobs.php
2020-05-18 15:50:36 +02:00
Laurent Destailleur
514009ca6d
Add field position in llx_website
2020-05-18 15:47:21 +02:00
Laurent Destailleur
756c1fd73d
Fix tooltip message
2020-05-18 15:26:04 +02:00
Laurent Destailleur
3d385dd378
Merge pull request #13903 from atm-maxime/fix_actioncomm_fetch_entity
...
Fix : entity was missing in actioncomm fetch
2020-05-18 14:59:10 +02:00
Laurent Destailleur
d60598b848
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-18 14:53:57 +02:00
Laurent Destailleur
d3ac33ce20
Fix json-ld file
2020-05-18 14:53:35 +02:00
ptibogxiv
a9d1519f96
FIX php error if multicompany disabled
2020-05-18 14:52:33 +02:00
Laurent Destailleur
729cc4fd6f
Fix do not show full path
2020-05-18 13:26:33 +02:00
Maxime Kohlhaas
3d9d5d0ad5
Fix : entity was missing in expedition fetch
2020-05-18 11:03:32 +02:00
Maxime Kohlhaas
baa502a224
Fix third merge issue with contact roles
2020-05-18 10:54:25 +02:00
Maxime Kohlhaas
cf96383bf9
Fix : entity was missing in actioncomm fetch
2020-05-18 10:44:55 +02:00
Frédéric FRANCE
54e2d72d8a
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-17 20:44:21 +02:00
Laurent Destailleur
02d4ecb21c
Fix url for youtube
2020-05-17 20:08:01 +02:00
Laurent Destailleur
9370f71d01
Fix hardcoded value
2020-05-17 20:03:56 +02:00
Laurent Destailleur
bd564486ff
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-17 20:03:09 +02:00
Laurent Destailleur
8a6ae84fb0
Fix getStructuredData for organization
2020-05-17 20:02:01 +02:00
Laurent Destailleur
6be60efaba
Fix bad link in json-ld
2020-05-17 19:09:22 +02:00
Laurent Destailleur
608d3ce32f
Responsive
2020-05-17 16:10:29 +02:00
Laurent Destailleur
106fe7bde6
Clean conflict between direct debit and direct credit orders.
2020-05-17 15:06:09 +02:00
Laurent Destailleur
af46108cc4
Look and feel v12
2020-05-17 13:34:16 +02:00
Anthony Berton
ceb3ba0e33
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE
2020-05-16 16:42:20 +02:00
Laurent Destailleur
783b71a9da
Fix language set
2020-05-16 16:27:23 +02:00
Laurent Destailleur
ce0d00a0ae
CSS
2020-05-16 15:50:46 +02:00
Anthony Berton
e1f8b50961
Delete 11.0.0-12.0.0.sql
2020-05-16 15:39:49 +02:00
Anthony Berton
ddb413c025
Create 12.0.0-13.0.0.sql
2020-05-16 15:37:13 +02:00
Laurent Destailleur
bd4251237b
css
2020-05-16 15:16:40 +02:00
Laurent Destailleur
c85233e779
Fix CSS
2020-05-16 15:12:28 +02:00
Laurent Destailleur
0781e9e227
CSS
2020-05-16 14:47:12 +02:00
Laurent Destailleur
75ac377352
Fix tar command
2020-05-16 04:26:43 +02:00
Laurent Destailleur
24f4a0be1f
exclude other log files
2020-05-16 04:24:23 +02:00
andreubisquerra
38346afe0e
Clean
2020-05-16 00:26:42 +02:00
andreubisquerra
ceafbb9855
Fix travis
2020-05-16 00:07:13 +02:00
jove@bisquerra.com
0847f5350a
TakePOS Auto Order improvements
2020-05-15 23:44:19 +02:00
Frédéric FRANCE
6d59b3f859
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-15 20:57:15 +02:00
Laurent Destailleur
791c4b48b6
Fix
2020-05-15 20:08:35 +02:00
Laurent Destailleur
ff07837053
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-15 19:01:54 +02:00
Laurent Destailleur
ff84fd8118
Fix default language of user. Must separate weblangs and pagelangs.
2020-05-15 19:01:12 +02:00
Frédéric FRANCE
62e0bfbb5f
enhance free email
2020-05-15 18:53:59 +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
Laurent Destailleur
3f5692c4d7
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-15 18:42:08 +02:00
Laurent Destailleur
a73eccf70d
FIX env of browser not loaded in website
2020-05-15 18:41:46 +02:00
Laurent Destailleur
762ca96203
FIX #13841
2020-05-15 18:28:15 +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
4a9960797b
responsive
2020-05-15 17:27:12 +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
9fb1766266
CSS
2020-05-15 17:14:28 +02:00
Laurent Destailleur
bfbe0037b6
Fix responsive
2020-05-15 16:29:18 +02:00
Laurent Destailleur
c43813ccbb
Fix responsive of edition of thirdparties
2020-05-15 16:23:24 +02:00
Laurent Destailleur
5fe9c45fb2
Fix look and feel v12
2020-05-15 16:07:39 +02:00
ptibogxiv
8d242cacae
Update 12.0.0-13.0.0.sql
...
update sql
2020-05-15 16:04:36 +02:00
ptibogxiv
e00152a845
Rename 12.0.0.-13.0.0.sql to 12.0.0-13.0.0.sql
2020-05-15 16:03:38 +02:00
ptibogxiv
6a0bc86ea6
Create 12.0.0.-13.0.0.sql
2020-05-15 16:03:03 +02:00
ptibogxiv
703fee0635
Update llx_commande.sql
2020-05-15 15:58:01 +02:00
ptibogxiv
1453b8469e
Update 11.0.0-12.0.0.sql
2020-05-15 15:56:16 +02:00
Laurent Destailleur
86ff60f161
Fix break line and set of opportunity fields
2020-05-15 15:50:50 +02:00
Laurent Destailleur
38059ab861
Fix trans
2020-05-15 15:17:37 +02:00
Laurent Destailleur
99db3a2991
Fix field for opportunities must be visible only if we use opportinities
2020-05-15 15:15:07 +02:00
Laurent Destailleur
895833effc
FIX #13864
2020-05-15 15:00:58 +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
b8aa635955
Merge pull request #13890 from andreubisquerra/master
...
Public photos for customers with TakePOS
2020-05-15 14:36:07 +02:00
Laurent Destailleur
b8d7a4373c
Update viewimage.php
2020-05-15 14:34:24 +02:00
Laurent Destailleur
f35a618699
Update index.php
2020-05-15 14:29:04 +02:00
Laurent Destailleur
3295b0d669
Update viewimage.php
2020-05-15 14:14:05 +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
Laurent Destailleur
b150edd6d0
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/societe/checkvat/checkVatPopup.php
2020-05-15 14:10:53 +02:00
Laurent Destailleur
ddf3f8b244
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-05-15 14:09:36 +02:00
Laurent Destailleur
d430b2896e
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-05-15 14:09:26 +02:00
Laurent Destailleur
987d3cf52e
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-05-15 14:04:58 +02:00
Langlais115
dc6ae70aa6
Fix #13805
...
Add proper type check to "seuil_stock_alerte" parameter.
2020-05-15 14:00:26 +02:00
Laurent Destailleur
00fb386522
Merge pull request #13894 from Langlais115/patch-1
...
Fix #13805 Add type check to "seuil_stock_alerte"
2020-05-15 13:59:57 +02:00
Laurent Destailleur
672ea60ffd
FIX #13896
2020-05-15 13:58:34 +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
Laurent Destailleur
91f87d6834
Fix bad param of getNomUrl
2020-05-15 13:52:35 +02:00
Laurent Destailleur
949ef8d7d8
Fix css
2020-05-15 12:49:22 +02:00
Laurent Destailleur
8a2741650a
Fix css
2020-05-15 12:46:55 +02:00
Laurent Destailleur
ad906fc508
Fix use SVG logo instead of PNG
2020-05-15 12:43:48 +02:00
Laurent Destailleur
bfca151d85
Responsive
2020-05-15 11:58:50 +02:00
Langlais115
100bfb921f
Fix #13805
...
Add proper type check to "seuil_stock_alerte" parameter.
2020-05-15 10:25:56 +02:00
stickler-ci
e691045c3d
Fixing style errors.
2020-05-14 23:20:39 +00:00
ptibogxiv
cb98ec4d23
Fix datapolicycron
2020-05-15 01:18:53 +02:00
Frédéric FRANCE
fbc6f2d954
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-14 21:25:41 +02:00
Alexandre SPANGARO
3811586cd0
FIX Site ec.europa.eu has moved to https://
2020-05-14 20:34:48 +02:00
Laurent Destailleur
0842259012
Fix lang must be set to null and not 0 when not defined
2020-05-14 18:56:07 +02:00
Laurent Destailleur
a660fd61c9
Fix lang must be set to null and not 0 when not defined
2020-05-14 18:55:20 +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
40fa0933eb
Fix on sarch pages
2020-05-14 18:44:21 +02:00
Laurent Destailleur
4cf7f68b6c
Fix search on pages
2020-05-14 18:44:05 +02:00
Laurent Destailleur
d8ee049b4c
Can select not defined language
2020-05-14 18:41:31 +02:00
Laurent Destailleur
40d30f9a60
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-14 18:37:47 +02:00
Laurent Destailleur
7daef0d146
Fix bad parameters of function
2020-05-14 18:17:08 +02:00
Laurent Destailleur
f7d69e443e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-14 18:15:08 +02:00
Laurent Destailleur
1bf677f537
Can set status of a websitepage
2020-05-14 18:14:55 +02:00
jove@bisquerra.com
991996697d
Public photos for customers with TakePOS
2020-05-14 18:03:22 +02:00
Laurent Destailleur
949e0f2326
Fix filter on language
2020-05-14 17:27:12 +02:00
Laurent Destailleur
a865dc7232
Merge pull request #13762 from indelog/rappaygroupmod
...
NEW possibilty to group payments by mode and show their subtotal
2020-05-14 16:55:37 +02:00
Laurent Destailleur
499c2ea30a
FIX #13855
2020-05-14 16:52:21 +02:00
Laurent Destailleur
215cf9e6f8
Prepare v13
2020-05-14 16:45:32 +02:00
Laurent Destailleur
b68722a66c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-14 16:40:51 +02:00
Laurent Destailleur
9becb24073
Prepare v13
2020-05-14 16:40:40 +02:00
Laurent Destailleur
aed917bda9
Merge pull request #13862 from aspangaro/12.0_a27
...
NEW Accountancy balance - Add a input to show subtotal by group
2020-05-14 16:40:02 +02:00
Laurent Destailleur
adcc9e14f6
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-14 16:35:39 +02:00
Laurent Destailleur
c1fb712c86
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-05-14 16:34:53 +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
92b245ae93
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/facture/card.php
2020-05-14 16:34:24 +02:00
Laurent Destailleur
2b8da85eea
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-05-14 16:20:15 +02:00
Laurent Destailleur
49cfc1afd8
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/install/upgrade2.php
2020-05-14 16:20:04 +02:00
Laurent Destailleur
61f1a57e2f
Merge pull request #13850 from andreubisquerra/master
...
TakePOS Auto Order improvements
2020-05-14 16:18:28 +02:00
Laurent Destailleur
bc581ead3b
Merge branch 'develop' into master
2020-05-14 16:17:37 +02:00
Laurent Destailleur
f5b9151f17
Merge pull request #13871 from FHenry/11.0
...
fix template email on propal list
2020-05-14 16:10:33 +02:00
Laurent Destailleur
136d002639
Merge pull request #13872 from simnandez/11.0
...
FIX: Do not show stats panel if the user does not have permissions
2020-05-14 16:09:37 +02:00
Laurent Destailleur
1032e5dfda
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-14 16:07:35 +02:00
Laurent Destailleur
b26c1757e6
Prepare v13
2020-05-14 16:07:23 +02:00
Laurent Destailleur
14fce7fe55
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-05-14 16:03:42 +02:00
Laurent Destailleur
3d26351c6b
Fix function if hours.
2020-05-14 16:03:31 +02:00
Laurent Destailleur
2c1e1f43dc
Merge pull request #13879 from frederic34/patch-4
...
Update dolistore.class.php
2020-05-14 16:00:36 +02:00
Laurent Destailleur
aae1b9f7fe
Merge pull request #13873 from ptibogxiv/patch-337
...
Fix mailing entity
2020-05-14 16:00:04 +02:00
Laurent Destailleur
30c167c6f4
Merge pull request #13885 from atm-maxime/fix_top_menu_search
...
Fix top menu search method must be GET
2020-05-14 15:58:32 +02:00
Laurent Destailleur
cf039b26f9
Merge pull request #13887 from atm-florianm/FIX_9.0_fatal_during_migration_from_dolibarr_3.1_if_php7
...
FIX 9.0 - fatal during migration from 3.1 using PHP 7
2020-05-14 15:49:08 +02:00
Laurent Destailleur
01525e1d3b
Merge pull request #13884 from indelog/impraccountfile
...
Fix and imporve some points for compta/accounting-flles.php
2020-05-14 15:48:30 +02:00
Laurent Destailleur
7c01b54d73
Fix version on module list
2020-05-14 15:42:37 +02:00
Laurent Destailleur
6ec5dd02b6
Fix Fatal error with bad triggers
2020-05-14 15:27:10 +02:00
Anthony Berton
06c08ad045
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE
2020-05-14 15:26:58 +02:00
Laurent Destailleur
68512e0281
Look and feel v12
2020-05-14 14:56:15 +02:00
Laurent Destailleur
9a8e9bdc99
Position of fields
2020-05-14 14:30:43 +02:00
Laurent Destailleur
ae0e6e4dc8
FIX dol_concatdesc to escape <
...
Better help
2020-05-14 14:30:36 +02:00
Laurent Destailleur
a796122f7b
Fix to solve feedbacks of
...
https://www.dolibarr.fr/forum/t/email-collector-avec-office-365-bug-et-contournement/32726
2020-05-14 14:30:32 +02:00
Laurent Destailleur
0b3e917155
CSS
2020-05-14 14:30:26 +02:00
Laurent Destailleur
4a04cecbaa
CSS
2020-05-14 14:30:22 +02:00
Laurent Destailleur
72c6aa81bb
Trans
2020-05-14 14:30:15 +02:00
Laurent Destailleur
4a65b629ee
Position of fields
2020-05-14 14:29:14 +02:00
Laurent Destailleur
bcaa83eeec
FIX dol_concatdesc to escape <
...
Better help
2020-05-14 14:10:04 +02:00
Laurent Destailleur
1bd00b0e8c
Fix to solve feedbacks of
...
https://www.dolibarr.fr/forum/t/email-collector-avec-office-365-bug-et-contournement/32726
2020-05-14 12:28:17 +02:00
stickler-ci
e3afa65880
Fixing style errors.
2020-05-14 09:38:27 +00:00
Anthony Berton
36b63ed921
Update list.php
2020-05-14 11:37:26 +02:00
ATM john
9f6a5d4cc9
Fix multicompany supplier product price filter
2020-05-14 10:50:20 +02:00
DEMAREST Maxime (Indelog)
ac0b735131
Fix use date_ech for social contributions in accounting-file.php
2020-05-13 18:01:00 +02:00
Frédéric FRANCE
be78ef5fb3
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-13 17:53:41 +02:00
DEMAREST Maxime (Indelog)
ee6e717f46
Add payment loan in accounting-files.php
2020-05-13 17:47:30 +02:00
DEMAREST Maxime (Indelog)
872518a91f
Add total by credit/debit for accounting-file.php
2020-05-13 16:54:53 +02:00
DEMAREST Maxime (Indelog)
5f400d27b4
Add preview file in compta/accounting-files.php
2020-05-13 15:01:32 +02:00
Laurent Destailleur
3b87b7c359
CSS
2020-05-13 13:29:50 +02:00
Laurent Destailleur
8e6efba0be
CSS
2020-05-13 12:49:53 +02:00
Laurent Destailleur
9785e0b852
Trans
2020-05-13 12:30:59 +02:00
Florian Mortgat
bd3504c473
FIX 9.0 - delete unused mandatory argument from migrate_clean_association: argument count mismatch causes a fatal error since php7
2020-05-13 10:26:44 +02:00
DEMAREST Maxime (Indelog)
fcb3b112d9
Fix use datep field for various payment in accouting-files.php
2020-05-13 09:31:14 +02:00
Maxime Kohlhaas
48183b396a
Fix top menu search method must be GET
2020-05-13 08:54:42 +02:00
stickler-ci
b7ae5ffa1d
Fixing style errors.
2020-05-13 06:12:45 +00:00
DEMAREST Maxime (Indelog)
0850570e95
Fix and imporve some points for compta/accounting-flles.php
...
* Fix zip generation for accouning-files if line has no document.
The zip file generated if $filesarray contain a line with empty 'files'
was unsustainable because it try to add empty files.
* Add clickable link to jump on card for other line than Invoice and
Supplier Invoice
* Add various payment
* Use label as ref for paiements of salaries line to display more explicit line
2020-05-13 08:00:06 +02:00
Laurent Destailleur
ebbd4413f5
Fix scrutinizer error
2020-05-13 00:47:27 +02:00
Laurent Destailleur
f0d14662b9
Fix scrutinizer
2020-05-13 00:38:12 +02:00
Laurent Destailleur
b5f3be4599
Clean phpcs rule file
2020-05-13 00:29:46 +02:00
Laurent Destailleur
63d6b3c47d
Look and feel v12
2020-05-12 23:44:50 +02:00
Laurent Destailleur
410694100d
CSS
2020-05-12 23:42:01 +02:00
Frédéric FRANCE
366ae2f116
Update dolistore.class.php
2020-05-12 18:44:26 +02:00
Frédéric FRANCE
39ae11efa3
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-12 18:02:52 +02:00
gauthier
fc2f2c6da7
FIX : wrong url param
2020-05-12 17:41:21 +02:00
andreubisquerra
8bd1179b82
Update qr.php
2020-05-12 17:03:24 +02:00
ptibogxiv
70ea77ce8f
Update list.php
2020-05-12 15:37:37 +02:00
ptibogxiv
f837bf043a
Update shipment.php
2020-05-12 15:34:48 +02:00
ptibogxiv
ce9b841d9f
Update shipment.php
2020-05-12 15:33:25 +02:00
Laurent Destailleur
734a8ba312
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-12 15:27:00 +02:00
Laurent Destailleur
0544434482
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-05-12 15:26:11 +02:00
Laurent Destailleur
b6afd86354
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-05-12 15:25:59 +02:00
Laurent Destailleur
4cf99585f8
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-05-12 15:24:15 +02:00
Laurent Destailleur
a6708009d7
Add option PROJECT_OPEN_ALWAYS_ON_TAB
2020-05-12 14:53:03 +02:00
Laurent Destailleur
e9c405182d
css
2020-05-12 14:18:31 +02:00
ptibogxiv
39f228b98a
Update list.php
2020-05-12 14:10:43 +02:00
Laurent Destailleur
c89e8efec3
responsive
2020-05-12 14:08:28 +02:00
ptibogxiv
447c61cc15
Update shipment.php
2020-05-12 13:49:55 +02:00
stickler-ci
83ec39f55a
Fixing style errors.
2020-05-12 11:44:12 +00:00
ptibogxiv
e1ff1bf865
Update card.php
2020-05-12 13:42:43 +02:00
stickler-ci
9e49e02efb
Fixing style errors.
2020-05-12 11:42:18 +00:00
ptibogxiv
014c013f83
Update card.php
2020-05-12 13:40:31 +02:00
ptibogxiv
c6e7b2e6a3
Fix date shipment from order
...
better for pickup collection with date and hour from order
2020-05-12 13:39:02 +02:00
ptibogxiv
e1db0ef855
Update index.php
2020-05-12 10:57:51 +02:00
Juanjo Menent
66beb7c14f
FIX: Do not show stats panel if the user does not have permissions
2020-05-12 10:17:47 +02:00
florian HENRY
33b663091e
Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0
2020-05-12 08:38:13 +02:00
florian HENRY
d9e26b8569
fix template email on prpal list
2020-05-12 08:38:03 +02:00
Frédéric FRANCE
7e5a07a863
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-12 07:57:32 +02:00
Alexandre SPANGARO
6b57ae4fcb
Merge remote-tracking branch 'upstream/develop' into 12.0_a27
2020-05-12 07:27:35 +02:00
Alexandre SPANGARO
0dccc9cbeb
Debug colspan
2020-05-12 07:27:20 +02:00
Laurent Destailleur
e4611f2950
Fix filter on categories
2020-05-12 03:36:33 +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
45caa02929
Merge pull request #13854 from bb2a/user-hide-inactive-in-config-module-users
...
NEW Add option to hide all inactive users into combo list of users.
2020-05-12 03:18:21 +02:00
Laurent Destailleur
3c8452aa31
Update admin.lang
2020-05-12 03:17:55 +02:00
Laurent Destailleur
6706d28eb7
Update admin.lang
2020-05-12 03:15:19 +02:00
Laurent Destailleur
2bf91c0f37
Merge pull request #13857 from bb2a/Link-phone-warehouse
...
Links phone on warehouse liste
2020-05-12 03:09:16 +02:00
Laurent Destailleur
92d137cde9
Update list.php
2020-05-12 03:09:04 +02:00
Laurent Destailleur
f6ac2d2545
Merge pull request #13866 from Tim-Otte/fix-11948
...
FIX #11948
2020-05-12 03:07:53 +02:00
Laurent Destailleur
a099858385
Update product.class.php
2020-05-12 03:07:23 +02:00
Laurent Destailleur
d459f9902c
Update card.php
2020-05-12 03:06:30 +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
Laurent Destailleur
e5fa5be0e5
Merge pull request #13861 from aspangaro/12.0_a26
...
NEW Bookkeeping by account - Look & feel v12
2020-05-12 03:02:32 +02:00
Laurent Destailleur
7be47097e9
Merge pull request #13867 from frederic34/patch-4
...
Only add empty select if no multiselect
2020-05-12 03:00:10 +02:00
Frédéric FRANCE
4d50ba5e37
Fix dolistore search with csrf active
2020-05-11 20:42:47 +02:00
Frédéric FRANCE
034df95ca1
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-11 20:29:07 +02:00
Laurent Destailleur
4584fa1aa6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/asset/list.php
htdocs/compta/bank/list.php
htdocs/contrat/services_list.php
htdocs/core/lib/date.lib.php
htdocs/expensereport/list.php
htdocs/fichinter/list.php
htdocs/holiday/list.php
htdocs/projet/tasks/list.php
htdocs/supplier_proposal/list.php
htdocs/user/list.php
2020-05-11 19:43:06 +02:00
Frédéric FRANCE
9c90996560
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-11 19:11:00 +02:00
Laurent Destailleur
c4a7923b51
CSS
2020-05-11 19:02:52 +02:00
Laurent Destailleur
44d36815bd
Look and feel v12
2020-05-11 19:00:27 +02:00
Frédéric FRANCE
3a46d5a3dd
Update agenda_other.php
2020-05-11 18:46:54 +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
atm-greg
64d2f906bc
fix visibility of extrafields in public interface
2020-05-11 16:35:58 +02:00
Tim Otte
65011c2877
Fixed the product unit translation
2020-05-11 15:11:23 +02:00
Laurent Destailleur
a2bc46f1c0
CSS
2020-05-11 12:50:24 +02:00
Laurent Destailleur
a8dcd2d09b
Clean code
2020-05-11 11:53:13 +02:00
Laurent Destailleur
02ec282812
Typo
2020-05-11 03:34:30 +02:00
Laurent Destailleur
7300b45bcd
Responsive
2020-05-11 01:19:33 +02:00
Laurent Destailleur
a83af075aa
Fix responsive
2020-05-11 00:35:05 +02:00
Laurent Destailleur
c511af69fe
Debug look and feel v12
2020-05-10 21:07:49 +02:00
Laurent Destailleur
501f1ba2c4
Fix look and feel v12
2020-05-10 15:45:07 +02:00
Laurent Destailleur
796f97c671
Support tag $capture in input of files
2020-05-10 15:08:01 +02:00
Alexandre SPANGARO
04480847df
NEW Accountancy balance - Add a button ShowSubtotalByGroup
2020-05-10 08:28:03 +02:00
stickler-ci
ff578198d6
Fixing style errors.
2020-05-10 04:35:52 +00:00
Alexandre SPANGARO
3da529f39c
Merge remote-tracking branch 'upstream/develop' into 12.0_a26
2020-05-10 06:30:04 +02:00
Alexandre SPANGARO
f40e978475
Fix delbookkeepingyear - add hook printFieldPreListTitle - Look & Feel v12
2020-05-10 06:28:50 +02:00
Laurent Destailleur
310c5f9eb6
Fix size of field
2020-05-09 21:56:51 +02:00
Laurent Destailleur
f58dd9d02f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-09 21:49:25 +02:00
Laurent Destailleur
fe241ea321
Fix removed not reliabled info in PHP info
2020-05-09 21:49:12 +02:00
Anthony Berton
53eb891a88
Update list.php
2020-05-09 18:48:01 +02:00
Anthony Berton
3644a718d8
1
2020-05-09 01:02:51 +02:00
Anthony Berton
52b47fd598
Update list.php
2020-05-09 00:28:23 +02:00
stickler-ci
c2dff7dfed
Fixing style errors.
2020-05-08 20:46:06 +00:00
Anthony Berton
a87d9cd740
Update list.php
2020-05-08 22:41:49 +02:00
Frédéric FRANCE
bd7a2d23a0
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-08 21:29:12 +02:00
Alexandre SPANGARO
12fb1658ce
Merge remote-tracking branch 'upstream/develop' into 12.0_a26
2020-05-08 20:45:52 +02:00
Laurent Destailleur
cd4c19f363
Merge pull request #13847 from aspangaro/12.0_a27
...
NEW Accountancy - Add Fiducial Winfic eWinfic WinSis Compta
2020-05-08 19:48:56 +02:00
Laurent Destailleur
a2f311d25a
Merge pull request #13845 from atm-maxime/fix_missing_hook_params
...
Fix missing hook params for printFieldListValue
2020-05-08 19:48:08 +02:00
Laurent Destailleur
bba8ab657e
Fix add missing migration
2020-05-08 18:57:15 +02:00
andreubisquerra
b89b6d7679
Name fix
2020-05-08 18:51:49 +02:00
andreubisquerra
f8ad954854
Fix URLs
2020-05-08 18:04:38 +02:00
andreubisquerra
1674048c81
Fix travis
2020-05-08 17:56:42 +02:00
jove@bisquerra.com
b93a3ceb29
TakePOS Auto Order improvements
2020-05-08 17:25:48 +02:00
Laurent Destailleur
c28a3e85a3
Fix constructor
2020-05-08 14:35:03 +02:00
Laurent Destailleur
6a2bb08107
Fix constructor
2020-05-08 14:34:02 +02:00
Laurent Destailleur
0138ab3f7c
Fix $weblangs must be initialized with language of page
2020-05-08 14:29:04 +02:00
Laurent Destailleur
c98663be4a
Fix sql
2020-05-08 14:05:04 +02:00
Laurent Destailleur
94d47c2acd
Fix sql
2020-05-08 14:04:17 +02:00
stickler-ci
7ad80c9bf6
Fixing style errors.
2020-05-08 11:53:11 +00:00
Alexandre SPANGARO
640158ea4c
NEW Accountancy - Add Fiducial Winfic eWinfic WinSis Compta
2020-05-08 13:50:26 +02:00
Alexandre SPANGARO
40ffbbe616
Debug
2020-05-08 13:28:56 +02:00
Alexandre SPANGARO
a49635a825
NEW Bookkeeping by account - Add selectfields & hook
2020-05-08 07:45:01 +02:00
Laurent Destailleur
e55d9ed3b8
Trans
2020-05-08 03:02:53 +02:00
Laurent Destailleur
a649dcecf7
Look and field
2020-05-08 03:01:51 +02:00
Laurent Destailleur
42ee755ea5
Look and feel v12
2020-05-08 02:52:55 +02:00
Maxime Kohlhaas
1a9afe6b20
Fix missing hook params for printFieldListValue
2020-05-08 01:40:25 +02:00
Regis Houssin
d9a0edcf2b
FIX missing file manifest.json.php
2020-05-08 00:01:56 +02:00
Laurent Destailleur
790bef98e5
Look and feel v12
2020-05-07 23:45:33 +02:00
Laurent Destailleur
830a117aa7
Suggest fix for #13824
2020-05-07 23:39:03 +02:00
Frédéric FRANCE
8f9ee3250d
clean
2020-05-07 23:28:32 +02:00
Laurent Destailleur
6d17b678e4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-07 23:06:30 +02:00
Laurent Destailleur
f23451e1c9
Update facture.class.php
2020-05-07 23:04:52 +02:00
Laurent Destailleur
dca3f3b31f
Look adn feel v12
2020-05-07 22:59:40 +02:00
Frédéric FRANCE
b88a84323b
clean
2020-05-07 22:59:34 +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
stickler-ci
7514a625fd
Fixing style errors.
2020-05-07 20:11:59 +00:00
Vaadasch
db8596743c
Update facture.class.php
...
Auto-update dates (if not empty) of services when cloning facture.
Actual code is only for month by month.
If empty (start or end) => do nothing
If set, update for next month if there is only 1d between what had been set and the start (or end) of the month.
If there is more than one day from start or end of the month => do nothing, because we're not sure the service is by month
Worst case scenario : the facture is cloned, the service is updated with new unwanted dates
User need to manually updates date : he would have done that either way
2020-05-07 22:09:55 +02:00
Frédéric FRANCE
f13c3447f1
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-07 21:49:01 +02:00
Laurent Destailleur
b84e9141a5
Merge pull request #13840 from OPEN-DSI/new-ticket-messages-show-on-card
...
NEW show messages on ticket card
2020-05-07 21:30:24 +02:00
Laurent Destailleur
9ea84b87e5
Merge pull request #13836 from frederic34/patch-6
...
session_cache_limiter before starting session
2020-05-07 21:22:56 +02:00
Laurent Destailleur
3638a59d8d
Merge pull request #13832 from frederic34/patch-4
...
fix html
2020-05-07 21:21:01 +02:00
Laurent Destailleur
0cd05887ce
FIX count of open day when date and start are not open should be 0
2020-05-07 17:21:27 +02:00
Frédéric FRANCE
6d5e83ad66
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-07 16:16:10 +02:00
Frédéric FRANCE
c28e6630bb
Update functions.lib.php
2020-05-07 15:41:21 +02:00
Frédéric FRANCE
dd1d29f983
add some substitutions for date datetime
2020-05-07 15:37:32 +02:00
VESSILLER
7e8cd565f4
NEW not show linked table on add message action
2020-05-07 14:35:04 +02:00
VESSILLER
ad489ab1b4
NEW show messages on ticket card
2020-05-07 12:22:13 +02:00
Laurent Destailleur
03fddd48af
Clean some constructors
2020-05-07 12:14:45 +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
695771726f
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-05-07 11:39:45 +02:00
Laurent Destailleur
d4400cf80f
FIX links into emails of notifications
2020-05-07 11:39:32 +02:00
Frédéric FRANCE
91dcf10375
session_cache_limiter before starting session
2020-05-06 23:56:02 +02:00
Frédéric FRANCE
3fcd9e6949
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-06 22:17:43 +02:00
Frédéric FRANCE
326dc7d367
fix html
...
file:///home/fred/Images/S%C3%A9lection_078.png
2020-05-06 17:59:40 +02:00
Laurent Destailleur
4c04ace9d8
fix reset of session
2020-05-06 15:39:07 +02:00
Laurent Destailleur
5e6b7fb6b4
Show message after pass reset
2020-05-06 15:36:14 +02:00
Laurent Destailleur
485896614b
Add message during password reset
2020-05-06 15:30:00 +02:00
Laurent Destailleur
1ec8b31e46
Fix remove action param in url to allow a second try without the error
...
message
2020-05-06 15:15:12 +02:00
Laurent Destailleur
abdb0cc8c0
Fix use correct trackid
2020-05-06 15:03:57 +02:00
Laurent Destailleur
db40dd8e49
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-06 14:48:58 +02:00
Laurent Destailleur
e7ae9c752e
Fix missing trackid
2020-05-06 14:48:02 +02:00
Laurent Destailleur
bfd4ebd49d
FIX Changing password message not visible if a background is set
2020-05-06 14:28:24 +02:00
Laurent Destailleur
c4d0133fbf
Merge pull request #13829 from indelog/accountreportincludevarpayloan
...
NEW Add include various payments and loans in accounting report with simplfified accountancy
2020-05-06 14:19:47 +02:00
Laurent Destailleur
3dbe9a4af1
Fix label
2020-05-06 13:59:15 +02:00
DEMAREST Maxime (Indelog)
889e5db4fb
Fix use Form::selectyesno() for added options in admin/compta.php
2020-05-06 13:55:38 +02:00
DEMAREST Maxime (Indelog)
7bf037ab2f
Fix blank line at end of control structure
2020-05-06 13:46:24 +02:00
DEMAREST Maxime (Indelog)
bf8cd51a5a
Fix somes code formating errors
2020-05-06 13:37:24 +02:00
DEMAREST Maxime (Indelog)
128ec6fd78
Add include various payments and loans in accounting report
...
For simplified accouning, behaviour not enable by default and must be
enabed in simplified accounting module admin page (or by global
settings ACCOUNTING_REPORTS_INCLUDE_VARPAY and
ACCOUNTING_REPORTS_INCLUDE_LOAN).
2020-05-06 12:58:41 +02:00
Tobias Sekan
3de77cff3f
fix lint errors
2020-05-06 12:11:54 +02:00
Tobias Sekan
3f5f6b3243
Fix lint errors
2020-05-06 12:09:39 +02:00
Tobias Sekan
0da091c609
Add missing lang entry
2020-05-06 11:51:50 +02:00
Tobias Sekan
8334afa154
Add link to new vendor invoice are page
2020-05-06 11:49:45 +02:00
Tobias Sekan
468829aa70
Add new vendor invoice area page
2020-05-06 11:48:01 +02:00
Tobias Sekan
5fb852b588
Add one new lang entry
2020-05-06 11:37:39 +02:00
Tobias Sekan
9b437c0585
Link to new customer invoice area
2020-05-06 11:36:30 +02:00
Tobias Sekan
d0efa79efa
Add customer invoice area
2020-05-06 11:34:31 +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
a8222c2651
Look and feel v12
2020-05-06 05:10:42 +02:00
Laurent Destailleur
b09f179a16
NEW Website logs are now into a separated log file.
2020-05-06 04:32:48 +02:00
Laurent Destailleur
30fede216c
Fix Add '_pw' var as var sensibles.
2020-05-06 04:03:07 +02:00
Laurent Destailleur
8512fba7db
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-06 03:49:25 +02:00
Laurent Destailleur
247acdd274
Fix position of custom groups of modules
2020-05-06 03:47:28 +02:00
Laurent Destailleur
e7f0035237
Merge pull request #13811 from frederic34/patch-4
...
nowtime is not defined
2020-05-06 02:23:58 +02:00
Laurent Destailleur
860b6e7557
Merge pull request #13812 from mapiolca/patch-45
...
Fix issue in status name
2020-05-06 02:23:15 +02:00
Laurent Destailleur
8f76d19827
Merge pull request #13822 from atm-florian/develop
...
fix filter on date service contrat with hour
2020-05-06 02:21:10 +02:00
Laurent Destailleur
9f176c5e2d
Fix trans
2020-05-06 01:41:10 +02:00
Anthony Berton
eb411d16ab
Update html.formproduct.class.php
2020-05-06 00:58:51 +02:00
Anthony Berton
2ccbc59bdb
Update stock.php
2020-05-06 00:57:11 +02:00
Anthony Berton
c6d2a1faf3
Add options
...
Add options in module stock
2020-05-06 00:48:00 +02:00
Laurent Destailleur
eacb1b3b2e
Debug modulebuilder
2020-05-05 21:45:10 +02:00
Alexandre SPANGARO
489a2cd0cc
NEW: Add quick dropdown menu in top right menu
2020-05-05 21:35:03 +02:00
Laurent Destailleur
650096ea0f
Fix look and feel v12
2020-05-05 21:27:40 +02:00
Laurent Destailleur
07178fb6c0
Fix look and feel
2020-05-05 20:52:50 +02:00
Laurent Destailleur
ebe169b9ef
Fix objects used for profit calculation.
2020-05-05 20:51:29 +02:00
Laurent Destailleur
d6c8988cec
Look and field v12
2020-05-05 19:29:47 +02:00
Laurent Destailleur
41aaf5363d
Fix templates
2020-05-05 18:53:41 +02:00
Frédéric FRANCE
93cac43306
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-05 18:37:56 +02:00
Laurent Destailleur
e354e71425
Fix link to themes on dolistore
2020-05-05 18:19:48 +02:00
Laurent Destailleur
49f9e88cc1
Look and feel v12
2020-05-05 18:16:30 +02:00
florian HENRY
ea145188b9
fix filter on date service contrat with hour
2020-05-05 18:14:38 +02:00
Laurent Destailleur
ded0526ca1
Merge pull request #13738 from bb2a/patch-6
...
links color for table title line is equal to Text color for table title line
2020-05-05 18:12:07 +02:00
Laurent Destailleur
e871e736eb
Fix for #5824
2020-05-05 17:55:03 +02:00
Laurent Destailleur
b2a9791dca
Fix pagination on pages "Related items"
2020-05-05 16:33:02 +02:00
atm-quentin
eab69c3a59
NEW multiselect categorie client stats facturation
2020-05-05 16:15:33 +02:00
atm-quentin
1b35380dda
NEW stats invoice graph with 3 bars
2020-05-05 16:13:04 +02:00
Laurent Destailleur
797beef79f
Fix
2020-05-05 15:26:41 +02:00
Laurent Destailleur
eda22f4270
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-05 15:22:41 +02:00
Laurent Destailleur
b7fe2b31cd
Merge pull request #13813 from oscim/patch-38
...
Update list.php
2020-05-05 15:22:29 +02:00
Laurent Destailleur
36a0780f14
More complete fix for #13817
2020-05-05 15:20:40 +02:00
Laurent Destailleur
7e6b5a384d
Code comment
2020-05-05 15:16:30 +02:00
Laurent Destailleur
d7d48936d2
Merge pull request #13816 from atm-gauthier/10.0_missinghookinit_and_tablefix
...
FIX : missing hook init + table class + $page not set
2020-05-05 15:15:42 +02:00
kamel
db591cdcd8
FIX: show value of the extrafields in the bank list
2020-05-05 14:47:31 +02:00
atm-lena
78a427c996
FIX wrong user right's name to top menu "commercial"
2020-05-05 14:35:03 +02:00
gauthier
c14b6884e3
FIX : missing hook init + table class + $page not set
2020-05-05 10:03:19 +02:00
oscim
c7753dd2e0
Update list.php
2020-05-05 09:44:46 +02:00
stickler-ci
204c788dec
Fixing style errors.
2020-05-05 06:56:54 +00:00
oscim
d6de46cc05
Update list.php
...
Add massaction for payment invoice
2020-05-05 08:54:52 +02:00
Pierre Ardoin
c0b9fef229
Fix issue in status name
...
Before : $commandestatic->LibStatut($obj->nb) shows bad value because bad param
Now : $commandestatic->LibStatut($obj->fk_statut) shows good value.
2020-05-05 08:40:30 +02:00
Frédéric FRANCE
93e69d515d
nowtime is not defined
2020-05-05 06:38:24 +02:00
Laurent Destailleur
d2d9ce3576
Merge pull request #13794 from atm-maxime/fix_addline_titles
...
Fix addline titles
2020-05-04 22:08:34 +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
5e4ef9266e
Fix update template to use for notifications
2020-05-04 20:30:02 +02:00
Laurent Destailleur
6d894b7abd
Fix missing link in message
2020-05-04 19:08:31 +02:00
Laurent Destailleur
821e11ca3c
Look and feel v12
2020-05-04 17:13:31 +02:00
Anthony Berton
00b9f8445f
Add default const
2020-05-04 17:11:44 +02:00
Laurent Destailleur
abd37c78f9
Fix responsive
2020-05-04 17:07:18 +02:00
Laurent Destailleur
f4a9490e7f
Fix a page with NOLOGIN const set to 1 must be into "public" dir.
2020-05-04 16:55:53 +02:00
Laurent Destailleur
f6e0553093
fix var_dump
2020-05-04 14:29:57 +02:00
Laurent Destailleur
358bc6d5df
Fix search on entities
2020-05-04 14:29:25 +02:00
Laurent Destailleur
3857c08277
Fix quick search on MO
2020-05-04 13:24:09 +02:00
Laurent Destailleur
4b34a6bd4a
Look and feel
2020-05-04 12:43:47 +02:00
Anthony Berton
b605569107
Merge branch 'PRODUCT_PRICE_BASE_TYPE' of https://github.com/bb2a/dolibarr into PRODUCT_PRICE_BASE_TYPE
2020-05-03 23:10:45 +02:00
Anthony Berton
c5544714c2
Traslate title param
2020-05-03 23:10:40 +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
Laurent Destailleur
dc5731dcd6
Merge pull request #13789 from simicar29/dev-selectproduits
...
Add / as a delimiter for replacement pattern in select_produits*
2020-05-03 21:47:26 +02:00
Laurent Destailleur
f0f6d6e314
Merge pull request #13793 from andreubisquerra/master
...
NEW tab for Bar Restaurant parameters and new AUTO ORDER
2020-05-03 21:45:08 +02:00
Laurent Destailleur
f74e3f1a90
Merge pull request #13790 from proprum/patch-1
...
MAIN_NO_CONCAT_DESCRIPTION in contrat/card.php
2020-05-03 21:26:52 +02:00
stickler-ci
ab20b5cb61
Fixing style errors.
2020-05-03 19:26:35 +00:00
Laurent Destailleur
2eb027833c
Update card.php
2020-05-03 21:25:49 +02:00
Laurent Destailleur
33669b6fd8
Update html.formproduct.class.php
2020-05-03 21:15:23 +02:00
stickler-ci
56a5e8ca3c
Fixing style errors.
2020-05-03 17:50:10 +00:00
Anthony Berton
485ef522d2
Add option HT TTC créate product
2020-05-03 19:47:10 +02:00
stickler-ci
080db7629f
Fixing style errors.
2020-05-03 15:21:00 +00:00
Anthony Berton
f42492764d
Update html.formproduct.class.php
...
DEFAULT_WAREHOUSE is not select in sherch
2020-05-03 17:16:25 +02:00
Laurent Destailleur
d27ccb0233
Fix pb of lang subdir in exporting website
2020-05-03 14:58:53 +02:00
Laurent Destailleur
da91a857a5
Fix pb of lang subdir in cloning website
2020-05-03 14:49:06 +02:00
Laurent Destailleur
77cf9fb569
Add .dolibarr file into CMS
2020-05-03 14:28:23 +02:00
Anthony Berton
d81ae29ab7
Update style.css.php
2020-05-03 14:05:18 +02:00
Anthony Berton
dabb2f4ad3
Update theme_vars.inc.php
2020-05-03 14:01:42 +02:00
Anthony Berton
a31eaf2eb8
Update style.css.php
2020-05-03 13:59:40 +02:00
Laurent Destailleur
fcee3a68f4
Fix sort on file manager of website
2020-05-03 13:00:39 +02:00
stickler-ci
ef3f121c88
Fixing style errors.
2020-05-03 08:51:50 +00:00
Anthony Berton
fdb98dd6ed
Update admin.lang
2020-05-03 10:49:57 +02:00
Anthony Berton
30cb4f0151
Update admin.lang
2020-05-03 10:48:16 +02:00
Anthony Berton
44bafb7225
Update ihm.php
2020-05-03 10:46:48 +02:00
Anthony Berton
2f18b444d7
Update style.css.php
2020-05-03 10:44:37 +02:00
Anthony Berton
f299f0f849
Update theme_vars.inc.php
2020-05-03 10:42:49 +02:00
stickler-ci
5c1eb08b3f
Fixing style errors.
2020-05-03 08:42:45 +00:00
Anthony Berton
87d86f32ee
Update usergroups.lib.php
2020-05-03 10:40:52 +02:00
Anthony Berton
c3521502de
Update global.inc.php
2020-05-03 10:34:56 +02:00
Maxime Kohlhaas
e0ebe85c13
Fix addline titles
2020-05-03 09:15:12 +02:00
andreubisquerra
fe98e430ce
Fix travis
2020-05-03 00:10:12 +02:00
andreubisquerra
8530db6dab
Fix travis
2020-05-03 00:09:17 +02:00
andreubisquerra
32923daa9d
Fix travis
2020-05-03 00:07:52 +02:00
andreubisquerra
ac75cf318e
Fix travis
2020-05-03 00:07:04 +02:00
andreubisquerra
35713ef004
Fix travis
2020-05-03 00:05:59 +02:00
jove@bisquerra.com
81c808692e
NEW Bar Restaurant tab and Auto order
2020-05-02 22:00:04 +02:00
proprum
1929f9132d
MAIN_NO_CONCAT_DESCRIPTION in contrat/card.php
...
Idem to propal/card.php
2020-05-02 17:25:22 +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
Laurent Destailleur
a5341bed9e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-02 12:56:33 +02:00
Laurent Destailleur
e9c60e64d6
Typo
2020-05-02 12:56:22 +02:00
Marc Guenneugues
bac17d6b95
Merge branch 'dev-replenish' of https://github.com/simicar29/dolibarr into dev-replenish
2020-05-02 09:27:22 +02:00
Marc Guenneugues
b65a4649e7
Correct lint errors
2020-05-02 09:26:58 +02:00
stickler-ci
1e3f31041d
Fixing style errors.
2020-05-02 07:23:06 +00:00
Marc Guenneugues
a03739962b
Propagate the value of limit
2020-05-02 09:21:51 +02:00
Marc Guenneugues
640730539e
NEW: Add option to include products without alert in replenish
2020-05-02 08:50:22 +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
c4b87d01ce
Fix non traversable var
2020-05-02 03:36:01 +02:00
Laurent Destailleur
90bbb9beac
Fix API to delete purchase price
2020-05-02 03:33:33 +02:00
Laurent Destailleur
4606b9fd9f
Fix name of class Service (already used by APIs)
2020-05-02 03:29:33 +02:00
Laurent Destailleur
7c6dc930d2
Fix var not defined
2020-05-02 03:25:34 +02:00
Laurent Destailleur
62a2469c71
Fix position of modules
2020-05-02 00:41:27 +02:00
Frédéric FRANCE
10fe016370
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-01 23:14:56 +02:00
Laurent Destailleur
c2c0e6517f
Fix init data of units D and H.
2020-05-01 22:44:46 +02:00
Laurent Destailleur
cc4a9ed10d
Merge pull request #13768 from TobiasSekan/MeasuringDirectoryToolTip
...
NEW tooltip for Unit_type and scale in "Dictionary setup - Measuring Units"
2020-05-01 22:36:04 +02:00
Laurent Destailleur
dc24738f93
Group columns about thirdparty data together
2020-05-01 22:34:49 +02:00
Frédéric FRANCE
f89131e2a0
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-01 22:27:04 +02:00
Laurent Destailleur
16e4c25caf
Merge pull request #13761 from aspangaro/12.0_a26
...
NEW: Accountancy add column thirdparty on binding page
2020-05-01 22:25:49 +02:00
Laurent Destailleur
3957b74d9a
Revert "FIX: add auto incrementation to llx_c_typent.sql"
...
This reverts commit 14a3aa2165
2020-05-01 22:17:33 +02:00
Laurent Destailleur
994b60b1d8
Revert use of autoincrement not possible with value 0
2020-05-01 22:17:13 +02:00
Laurent Destailleur
efb79a4008
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-01 22:16:21 +02:00
Laurent Destailleur
10af669719
Fix missing autoincrement
2020-05-01 22:14:09 +02:00
Laurent Destailleur
b3dd873656
Merge pull request #13777 from lecoqlibre/develop
...
FIX: add auto incrementation to llx_c_typent.sql
2020-05-01 22:13:57 +02:00
Laurent Destailleur
63bb4b82e9
Merge pull request #13772 from andreubisquerra/master
...
Finish send receipt by email from TakePOS
2020-05-01 22:05:57 +02:00
Laurent Destailleur
8208e81622
Merge pull request #13767 from indelog/statsbytype
...
Add possibility to filter stats by ThirdParty type and categorie
2020-05-01 22:05:06 +02:00
Laurent Destailleur
18a36de69b
Merge pull request #13779 from frederic34/patch-4
...
$tmpplugin was defined after use
2020-05-01 22:02:04 +02:00
Laurent Destailleur
b74a4c6995
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-01 22:00:11 +02:00
Laurent Destailleur
75dd5f268f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
htdocs/core/lib/sendings.lib.php
2020-05-01 22:00:00 +02:00
Laurent Destailleur
160009630f
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/admin/tools/dolibarr_export.php
2020-05-01 21:57:28 +02: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
Laurent Destailleur
14a81eea5f
Merge pull request #13781 from nervo/reindent-module-template
...
Reindent module template
2020-05-01 20:45:47 +02:00
Laurent Destailleur
cb48011b17
Merge pull request #13780 from nervo/psr-2-noncompliance
...
PSR-2 Noncompliance
2020-05-01 20:43:30 +02:00
Frédéric FRANCE
3c7265e357
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-01 17:12:17 +02:00
Laurent Destailleur
c1b530f58f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/get_menudiv.php
2020-05-01 15:56:01 +02:00
Laurent Destailleur
1c7873b4f4
FIX Sanitizing menu parameter
2020-05-01 15:53:56 +02:00
Frédéric FRANCE
92898c9562
enable free emails with select2
2020-05-01 11:27:11 +02:00
nervo
ba0ca3f7f7
Reindent module template
2020-05-01 08:40:55 +02:00
nervo
bc32b75fd2
PSR-2 Noncompliance
2020-05-01 08:13:03 +02:00
Frédéric FRANCE
fddbe7c929
$tmpplugin was defined after use
2020-05-01 07:50:46 +02:00
Laurent Destailleur
625c7216a9
Can show date of validation in list
2020-04-30 19:51:24 +02:00
Laurent Destailleur
e4edd143c5
Fix field name
2020-04-30 19:41: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
4c27ae6530
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/facture/card.php
2020-04-30 18:47:18 +02:00
Laurent Destailleur
b1495e12ce
FIX A variable was erased by a temporary variable
2020-04-30 18:45:00 +02:00
Maxime Lecoq
14a3aa2165
FIX: add auto incrementation to llx_c_typent.sql
2020-04-30 18:21:25 +02:00
Laurent Destailleur
5948d385a3
Look and feel v12
2020-04-30 14:46:49 +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
andreubisquerra
281a97404a
Fix travis
2020-04-30 01:27:55 +02:00
jove@bisquerra.com
4dbd16077e
Finish send receipt by email from TakePOS
2020-04-30 01:10:12 +02:00
Laurent Destailleur
6d79eed8c1
Fix colspan alignement
2020-04-29 20:36:14 +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
DEMAREST Maxime (Indelog)
790cffb7ae
Correct select label for categories in stats pages
2020-04-29 15:24:13 +02:00
DEMAREST Maxime (Indelog)
398b0234ea
Correct label for select thirdparty categorie in invoice stats
2020-04-29 14:10:06 +02:00
Tobias Sekan
9e7c0c14d9
Add two new lang entries (admin)
2020-04-29 13:30:58 +02:00
Tobias Sekan
56dee72b66
add tooltip for unit_type and scale (admin)
2020-04-29 13:30:14 +02:00
DEMAREST Maxime (Indelog)
1bd9372022
Forgot comments to document news params for the modified methods
2020-04-29 10:00:29 +02:00
DEMAREST Maxime (Indelog)
40f1bed8d0
Add possibility to filter stats by ThirdParty type and categorie
2020-04-29 09:17:44 +02:00
Laurent Destailleur
f8dfe886ac
Fix css
2020-04-28 20:52:24 +02:00
Laurent Destailleur
293034dd89
css
2020-04-28 19:47:31 +02:00
Laurent Destailleur
a7815e0aac
css
2020-04-28 19:44:32 +02:00
Laurent Destailleur
e68f51c4cd
csss
2020-04-28 19:42:39 +02:00
Laurent Destailleur
4d22baabfe
CSS
2020-04-28 19:40:25 +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
66b33573ef
Fix menu
2020-04-28 18:30:38 +02:00
Laurent Destailleur
93a894df5c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-28 18:08:37 +02:00
Laurent Destailleur
483935493c
Fix look and feel
2020-04-28 18:08:26 +02:00
Laurent Destailleur
478bd60ad2
Merge pull request #13760 from ptibogxiv/patch-336
...
FIX files download by API/entity
2020-04-28 18:01:42 +02:00
Laurent Destailleur
6990bef6a2
Merge pull request #13764 from Tim-Otte/fixProjectTaskListStatusSearch
...
Fixed project task list search
2020-04-28 18:01:10 +02:00
Laurent Destailleur
aa9ee060d5
Look and feel v12
2020-04-28 17:34:11 +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
91523b4b64
FIX Can switch from double to price type for extrafields
...
Conflicts:
htdocs/core/tpl/admin_extrafields_edit.tpl.php
2020-04-28 14:27:22 +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
Laurent Destailleur
7a73915e92
FIX Can switch from double to price type for extrafields
2020-04-28 14:22:13 +02:00
Tim Otte
947609fc12
Minor fix
2020-04-28 12:59:15 +02:00
Tim Otte
afbd73b946
Merge pull request #3 from Dolibarr/develop
...
Merging changes from Dolibarr
2020-04-28 12:42:05 +02:00
Tim Otte
4a8173f498
Fixed search_projectstatus to allow default values
2020-04-28 12:40:10 +02:00
Laurent Destailleur
72c8397e36
css
2020-04-28 11:24:13 +02:00
stickler-ci
2cf5f12a62
Fixing style errors.
2020-04-28 07:18:45 +00:00
kkhelifa-opendsi
908c653743
Merge branch 'develop' into stcommcontact
2020-04-28 09:03:17 +02:00
DEMAREST Maxime (Indelog)
740b2c9228
NEW possibilty to group payments by mode and show their subtotal
...
This add two params (PAYMENTS_REPORT_GROUP_BY_MOD and
PAYMENTS_FOURN_REPORT_GROUP_BY_MOD) for payments and supplier payments
to group them by mode and get subtotals for each mode. Add the
corresponding configuration options on admin page fore each payments and
supplier payments.
2020-04-28 09:01:00 +02:00
Alexandre SPANGARO
1f6c959b72
NEW: Accountancy add column thirdparty on binding page
2020-04-28 04:55:54 +02:00
Alexandre SPANGARO
b3efa4f793
Merge remote-tracking branch 'upstream/develop' into 12.0_a26
2020-04-28 04:45:24 +02:00
Alexandre SPANGARO
31583c9b63
NEW: Accountancy add column thirdparty on binding page
2020-04-28 04:45:06 +02:00
Laurent Destailleur
a40c2fdbfc
Debug v12
2020-04-28 02:58:33 +02:00
Laurent Destailleur
fb8bdefbaa
Look and feel v12
2020-04-28 02:10:26 +02:00
Laurent Destailleur
52fc149faa
Fix permissions
2020-04-28 01:04:37 +02:00
ptibogxiv
9764c85ee3
FIX files download by API/entity
...
TODO need more clean of this file with multicompany
2020-04-27 19:15:17 +02:00
Laurent Destailleur
a8613661fc
Fix sql
2020-04-27 19:03:04 +02:00
Laurent Destailleur
12e090eed6
Fix search in correct language
2020-04-27 18:48:35 +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
kamel
4dd42496fa
Correction pour validation Stickler CI / stickler-ci
2020-04-27 17:48:05 +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
635b9bb0fe
FIX #13641
2020-04-27 15:27:03 +02:00
Laurent Destailleur
6b1a1e5e58
FIX #13743
2020-04-27 15:09:27 +02:00
Laurent Destailleur
ed045b2673
FIX #13749
2020-04-27 15:04:31 +02:00
Laurent Destailleur
a1142f884d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-27 15:03:34 +02:00
Laurent Destailleur
581d4dbcd9
Look and feel v12
2020-04-27 14:39:38 +02:00
Laurent Destailleur
50d9f466d4
FIX #13749
2020-04-27 14:38:45 +02:00
stickler-ci
fdc0543b4d
Fixing style errors.
2020-04-27 12:16:24 +00:00
Laurent Destailleur
1c70e49695
Merge branch 'develop' into 12.0_a23
2020-04-27 14:14:13 +02:00
Laurent Destailleur
d8ba28185a
Merge pull request #13706 from leninrivas/develop
...
Cancel shipping
2020-04-27 14:06:39 +02:00
Laurent Destailleur
17a4447ccb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-04-27 14:02:28 +02:00
Laurent Destailleur
ed63287797
Fix font
2020-04-27 14:02:18 +02:00
Laurent Destailleur
fe3359022a
Merge pull request #13747 from bb2a/patch-7
...
Link Phone in list
2020-04-27 13:49:30 +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
3c1d989c30
FIX #13751
2020-04-27 11:41:35 +02:00
gauthier
7f56c4a785
FIX : Another "Access to undeclared static property: Contact::$table_element" && "Societe::$table_element"
2020-04-27 11:18:53 +02:00
Ferran Marcet
b90a6024f5
FIX: Wrong Sql on getListOfTowns api method
2020-04-27 10:15:47 +02:00
Laurent Destailleur
4c605283f5
Fix phpcs
2020-04-27 00:09:21 +02:00
Laurent Destailleur
c0821a8ed6
Fix phpcs
2020-04-27 00:02:31 +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
a36d0c96c1
Fix sql
2020-04-26 22:28:43 +02:00
Laurent Destailleur
06cb0194d5
Look and feel v12
2020-04-26 14:12:51 +02:00
Laurent Destailleur
58409ce93e
Look and feel v12
2020-04-26 14:11:25 +02:00
Anthony Berton
62ca9a984e
Update list.php
2020-04-25 21:42:59 +02:00
Laurent Destailleur
1d68510c7d
Fix syntax error
2020-04-25 19:32:18 +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
b426bbe758
Fix bad code
2020-04-25 17:47:41 +02:00
Laurent Destailleur
3090eb578b
Look and feel v12
2020-04-25 17:43:12 +02:00
Marc Guenneugues
a040cd0305
Properly assign ->id in expensereport fetch_lines
2020-04-25 15:19:47 +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
Laurent Destailleur
1121d2c1c6
Look and feel v12
2020-04-25 13:49:44 +02:00
Laurent Destailleur
731864eb4a
Removed useless translation keys
2020-04-25 12:43:41 +02: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
99f445962b
Fix regression
2020-04-25 03:38:12 +02:00
Laurent Destailleur
4dc8e59e7f
Fix order of thumbs
2020-04-25 03:34:31 +02:00
Laurent Destailleur
5ce3174181
Look and feel v12
2020-04-25 03:31:47 +02:00
Laurent Destailleur
38f2aad0c6
Debug asset module
2020-04-25 03:19:30 +02:00
Laurent Destailleur
6b114a31ce
Look and feel v12
2020-04-25 03:00:41 +02:00
Laurent Destailleur
c9f242406c
Look and feel v12
2020-04-25 02:44:24 +02:00
Laurent Destailleur
291664d109
Look and feel v12
2020-04-25 01:04:26 +02:00
Laurent Destailleur
3ed11f374a
Look and feel v12
2020-04-24 23:56:57 +02:00
Anthony Berton
ac872b6d3d
Update global.inc.php
2020-04-24 23:36:37 +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
fc1a1c6afe
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-04-24 19:56:29 +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
6798e9e6f5
Fix remove warning missing the seller in update_price
2020-04-24 19:52:54 +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
48245cf134
Merge pull request #13735 from atm-gauthier/11.0_fix_elementtype
...
FIX : Access to undeclared static property: Contact::$table_element
2020-04-24 19:02:11 +02:00
Laurent Destailleur
e84601f5ed
Merge pull request #13710 from TobiasSekan/FixMissingErrorOnCloneObject
...
FIX not shown error on clone vendor invoice with ExtraFields
2020-04-24 19:01:42 +02:00
Laurent Destailleur
4564a5cffd
Update accounting-files.php
2020-04-24 19:01:08 +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
Laurent Destailleur
7bbfd2175d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.dispatch.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/reception/class/reception.class.php
2020-04-24 18:58:47 +02:00
florian HENRY
a685026756
fix: remove php warning
2020-04-24 17:22:35 +02:00
Laurent Destailleur
d2e17c5427
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-24 16:27:56 +02:00
Laurent Destailleur
b77892451f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-04-24 16:21:58 +02:00
Laurent Destailleur
21665cdc85
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2020-04-24 16:21:51 +02:00
Laurent Destailleur
df91780552
FIX Situation invoice take into account the credit notes.
2020-04-24 15:57:08 +02:00
gauthier
e98671e404
FIX : Access to undeclared static property: Contact::$table_element
2020-04-24 15:22:38 +02:00
Laurent Destailleur
b2b580f6fb
Report error
2020-04-24 15:21:38 +02:00
Laurent Destailleur
42ee9845ad
Report error
2020-04-24 15:21:02 +02:00
Laurent Destailleur
9764af7e9c
Merge pull request #13731 from simicar29/11.0-reception
...
Clean line extrafields when deleting reception
2020-04-24 15:16:51 +02:00
Laurent Destailleur
eda3643639
Merge pull request #13730 from simicar29/11.0-expedition
...
Clean line extrafields when deleting expedition
2020-04-24 15:16:41 +02:00
Laurent Destailleur
c96937d101
Merge pull request #13729 from simicar29/11.0-contrat
...
Clean line extrafields when deleting contrat
2020-04-24 15:16:29 +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
Tobias Sekan
5d9432e4d0
fix style
2020-04-24 14:02:54 +02:00
Tobias Sekan
cab4f35438
fix missing vcard values
2020-04-24 14:01:08 +02:00
Frédéric FRANCE
1aafd4667b
fix countable php7 warning
2020-04-24 11:57:23 +02:00
Matt Sidnell
dd070cc680
Update commonobject.class.php
2020-04-23 20:37:15 +01:00
Laurent Destailleur
5756e3be09
Look and feel v12
2020-04-23 20:45:51 +02:00
Laurent Destailleur
997c2344cb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-23 20:03:52 +02:00
Laurent Destailleur
2ba6e65feb
Fix label
2020-04-23 20:03:41 +02:00
stickler-ci
ababad540a
Fixing style errors.
2020-04-23 17:29:52 +00:00
Laurent Destailleur
a90398af06
Merge pull request #13726 from simicar29/11.0-supplierproposal
...
Clean line extrafields when deleting supplier proposal
2020-04-23 19:27:39 +02:00
Laurent Destailleur
2fcb2ff19f
Merge pull request #13727 from simicar29/11.0-fichinter
...
Clean line extrafields when deleting fichinter
2020-04-23 19:27:22 +02:00
Marc Guenneugues
b4fbb86548
Clean line extrafields when deleting reception
2020-04-23 19:22:25 +02:00
Marc Guenneugues
3ea8d1895b
Clean line extrafields when deleting expedition
2020-04-23 19:09:05 +02:00
stickler-ci
b8a4c0d83b
Fixing style errors.
2020-04-23 17:02:57 +00:00
Marc Guenneugues
a70be95760
Clean line extrafields when deleting contrat
2020-04-23 19:00:47 +02:00
Laurent Destailleur
7f0e019c78
Merge pull request #13725 from simicar29/11.0-supplierorder
...
Clean line extrafields when deleting supplier order
2020-04-23 18:56:09 +02:00
stickler-ci
93735bf9cd
Fixing style errors.
2020-04-23 16:55:36 +00: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
Laurent Destailleur
9679b1f04c
Merge pull request #13704 from frederic34/actioncomm_note
...
actioncomm note deprecated
2020-04-23 18:52:56 +02:00
Marc Guenneugues
285f215acf
Clean line extrafields when deleting fichinter
2020-04-23 18:52:45 +02:00
Laurent Destailleur
4e6017e5bf
Look and feel v12
2020-04-23 18:50:20 +02:00
Laurent Destailleur
0aa0d62f43
Fix constant
2020-04-23 18:42:59 +02:00
Laurent Destailleur
201a2349f6
Merge branch 'develop' into patch-324
2020-04-23 18:39:30 +02:00
Laurent Destailleur
388e98fdf0
Merge pull request #13724 from simicar29/11.0-supplierinvoice
...
Clean line extrafields when deleting supplier invoice
2020-04-23 18:35:34 +02:00
Marc Guenneugues
ab5c2b1fd5
Clean line extrafields when deleting supplier proposal
2020-04-23 18:33:58 +02:00
Laurent Destailleur
922efaf49b
Merge pull request #13714 from simnandez/11.0
...
FIX: Error update SQL into stock reception
2020-04-23 18:31:11 +02:00
Laurent Destailleur
02c5530e1f
Update mouvementstock.class.php
2020-04-23 18:31:01 +02:00
stickler-ci
4b58213e5b
Fixing style errors.
2020-04-23 16:29:36 +00:00
Marc Guenneugues
64d877bc7b
Clean line extrafields when deleting supplier order
2020-04-23 18:27:06 +02:00
Laurent Destailleur
bcad90ccf2
Merge pull request #13715 from ndrosis/patch-25
...
Fix check VAT ID HTTP to HTTPS
2020-04-23 18:22:39 +02:00
Laurent Destailleur
00e9ed1452
Merge pull request #13716 from atm-florian/11.0
...
fix: remove debug pring
2020-04-23 18:22:18 +02:00
Laurent Destailleur
dc0978e88b
Merge pull request #13720 from FHenry/dev_fix_odt
...
fix: uniformize extrafeild replacemnt for ODT docs
2020-04-23 18:22:00 +02:00
Laurent Destailleur
8401f68bde
Update doc_generic_task_odt.modules.php
2020-04-23 18:21:17 +02:00
stickler-ci
b5f48fb815
Fixing style errors.
2020-04-23 16:17:37 +00:00
Marc Guenneugues
039fe92209
Clean line extrafields when deleting supplier invoice
2020-04-23 18:14:56 +02:00
Laurent Destailleur
5edd8b1206
Merge pull request #13722 from simicar29/11.0-commande
...
Clean line extrafields when deleting order
2020-04-23 18:13:34 +02:00
Laurent Destailleur
c8a93437ff
Merge pull request #13721 from simicar29/11.0
...
Clean line extrafields when deleting invoice
2020-04-23 18:12:28 +02:00
Marc Guenneugues
94be1870ec
Clean line extrafields when deleting proposal
2020-04-23 18:02:53 +02:00
Laurent Destailleur
1101c4e587
Fix trans
2020-04-23 18:01:04 +02:00
Laurent Destailleur
f7d4d78008
Fix error 500
2020-04-23 17:55:55 +02:00
Marc Guenneugues
be46b2062e
Clean line extrafields when deleting order
2020-04-23 17:51:06 +02:00
Laurent Destailleur
86be024dcc
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modFournisseur.class.php
2020-04-23 17:17:42 +02:00
Laurent Destailleur
cd1368cb71
Fix dispatch in ledger for various payment done in same account when
...
there is 2 different transaction in 2 different account (backport v12)
2020-04-23 17:10:40 +02:00
stickler-ci
2633e90890
Fixing style errors.
2020-04-23 15:03:14 +00:00
simicar29
ce94788dd9
Clean line extrafields when deleting recurring invoice
...
Delete extrafields recurring invoice lines when deleting parent object
Delete extrafields when deleting a recurring invoice line
2020-04-23 17:01:40 +02:00
stickler-ci
aebc04d30a
Fixing style errors.
2020-04-23 14:33:11 +00:00
simicar29
b68e85703f
Clean line extrafields when deleting invoice
...
Delete extrafields invoice lines when deleting parent object (sql syntax ok for mariadb & pgsql)
Delete extrafields when deleting an invoice line
2020-04-23 16:29:22 +02: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
florian HENRY
6dafb30ee8
fix time duration substitution
2020-04-23 15:57:06 +02:00
florian HENRY
55a9aa5991
fix: missing duration odt task substitution
2020-04-23 15:55:37 +02:00
Laurent Destailleur
68e9d8463a
Debug MAIN_USE_ALTERNATE_TRANSLATION_FOR variable
2020-04-23 15:52:15 +02:00
florian HENRY
da80bacf9b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2020-04-23 15:50:53 +02:00
florian HENRY
882b39628f
fix: uniformize extrafeild replacemnt for ODT docs
2020-04-23 15:50:42 +02:00
Frédéric FRANCE
2098021010
Merge remote-tracking branch 'upstream/develop' into entrepotlibelle
2020-04-23 14:10:39 +02:00
Laurent Destailleur
defef24c3c
Fix regression
2020-04-23 13:57:27 +02:00
Laurent Destailleur
6819255b76
FIX #13650
2020-04-23 13:49:18 +02:00
florian HENRY
7972174787
remove debug pring
2020-04-23 13:44:23 +02:00
Laurent Destailleur
436362502c
CSS
2020-04-23 13:41:51 +02:00
Laurent Destailleur
3a9add0e70
FIX #13663
2020-04-23 13:37:43 +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
Laurent Destailleur
4475df14b4
Finish removal of duplicate hook/trigger
2020-04-23 12:54:28 +02:00
Laurent Destailleur
e1129babbc
Code comment
2020-04-23 12:44:30 +02:00
Laurent Destailleur
93278b2dca
FIX #13713
2020-04-23 12:42:03 +02:00
Laurent Destailleur
46716f2259
Typo
2020-04-23 12:34:37 +02:00
Laurent Destailleur
8f8ae5a4db
Fix typo
2020-04-23 12:33:22 +02:00
Drosis Nikos
d11396be3e
Fix check VAT ID HTTP to HTTPS
...
No response to HTTP
2020-04-23 13:22:30 +03:00
Laurent Destailleur
18d3d68cae
Fix def
2020-04-23 12:22:24 +02:00
Laurent Destailleur
da02863242
Code comment
2020-04-23 12:19:51 +02:00
Juanjo Menent
0999f5e6f2
FIX: Error update SQL into stock reception
2020-04-23 12:12:50 +02:00
Laurent Destailleur
69f4a3e7b0
Doc
2020-04-23 11:41:03 +02:00
Sekan, Tobias
f793844862
Fix missing errror on facture clone
2020-04-23 11:04:14 +02:00
stickler-ci
ff694c22d1
Fixing style errors.
2020-04-23 05:54:13 +00:00
Lenin Rivas
47654fd629
Shipment Canceled
...
Shipment canceled, not delete ref and recovery stock.
2020-04-23 00:49:31 -05:00
Lenin Rivas
e152567122
Add Button Cancel
...
And cancel confirmation
2020-04-23 00:38:08 -05:00
Frédéric FRANCE
177008ab65
actioncomm note deprecated
2020-04-23 00:45:33 +02:00
Frédéric FRANCE
4220d6b253
actioncomm note deprecated
2020-04-23 00:38:42 +02:00
Frédéric FRANCE
3541020912
remove deprecated libelle
2020-04-23 00:13:51 +02:00
Frédéric FRANCE
2349c2be22
remove deprecated libelle
2020-04-22 23:55:50 +02:00
Frédéric FRANCE
061f4623b3
remove deprecated libelle
2020-04-22 23:53:00 +02:00
ATM john
3f5270cf39
Remove getValue Method : usage of fetch_row is deprecated
2020-04-22 23:12:15 +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
b971aabf3c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-22 22:13:04 +02:00
Laurent Destailleur
b6786c515a
picto
2020-04-22 22:12:53 +02:00
Laurent Destailleur
b19e0d43fd
Merge pull request #13701 from frederic34/patch-1
...
Update api_bankaccounts.class.php
2020-04-22 22:12:09 +02:00
Laurent Destailleur
a7641cdb90
CSS
2020-04-22 22:02:25 +02:00
Laurent Destailleur
9bda294edc
Fix set default warehouse of product in MO consumption
2020-04-22 21:41:56 +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
245f89ceaa
Look and feel v12
2020-04-22 21:28:23 +02:00
Frédéric FRANCE
4605b9ec61
Update api_bankaccounts.class.php
2020-04-22 19:16:58 +02:00
Laurent Destailleur
3170060c65
Help show format of price
2020-04-22 18:34:52 +02:00
Laurent Destailleur
52c8e3aff1
Look and feel v12
2020-04-22 18:30:25 +02:00
Laurent Destailleur
3101f72b5c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-22 18:28:59 +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
80271cc852
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-04-22 18:24:00 +02:00
Laurent Destailleur
7bc8a70b0a
FIX #13670
2020-04-22 18:23:48 +02:00
Laurent Destailleur
bbfb93bc42
Merge pull request #13690 from OPEN-DSI/new-societe-import-update-contacts
...
NEW can update contact in import model
2020-04-22 18:09:49 +02:00
Laurent Destailleur
8598fd99c2
if not exists not required
2020-04-22 18:08:02 +02:00
Laurent Destailleur
31c8645a35
Merge pull request #13694 from frederic34/patch-1
...
Update 11.0.0-12.0.0.sql
2020-04-22 18:06:27 +02:00
Laurent Destailleur
2dc586c325
Merge pull request #13660 from jribal/patch-2
...
add project object dependency
2020-04-22 18:02:42 +02:00
Laurent Destailleur
496d8f354f
Look and feel v12
2020-04-22 17:59:54 +02:00
Laurent Destailleur
a61d2c9d62
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-22 16:36:05 +02:00
Laurent Destailleur
eee9e79436
Tooltip
2020-04-22 16:35:25 +02:00
gauthier
43f4c5ac96
FIX : model export list must be sorted by label
2020-04-22 15:29:54 +02:00
Frédéric FRANCE
63186a60ae
Update 11.0.0-12.0.0.sql
2020-04-22 14:23:38 +02:00
Laurent Destailleur
7e9fe20365
Merge pull request #13664 from indelog/socinfoonprint
...
NEW possibility to show society info when print page
2020-04-22 14:11:34 +02:00
Laurent Destailleur
4777c74366
Update main.inc.php
2020-04-22 14:11:03 +02:00
Laurent Destailleur
5c133b9c6c
Merge pull request #13686 from frederic34/patch-10
...
add extrafields in note for enstein and azur
2020-04-22 13:19:07 +02:00
Laurent Destailleur
c1d0cae24d
Merge pull request #13692 from hregis/11.0_bug
...
FIX missing fk_bank during export of suppliers invoices
2020-04-22 13:18:46 +02:00
Laurent Destailleur
22162ac57e
Fix rounding of quantities
2020-04-22 13:14:50 +02:00
Laurent Destailleur
e91d263a6a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-22 12:57:02 +02:00
Laurent Destailleur
a5def19cff
Fix calculation from a BOM > 1
2020-04-22 12:56:52 +02:00
Laurent Destailleur
e93db1f3c5
Merge pull request #13671 from leninrivas/develop
...
Fix calculator to consume with to produce
2020-04-22 12:56:29 +02:00
Laurent Destailleur
8754fc1d1e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-22 12:40:21 +02:00
Laurent Destailleur
9a5986e190
css
2020-04-22 12:40:11 +02:00
Laurent Destailleur
169378f276
Update mo.class.php
2020-04-22 12:34:02 +02:00
Laurent Destailleur
1788b1b252
Update mo.class.php
...
Use the accuracy of stock for rounding
2020-04-22 12:32:20 +02:00
Regis Houssin
f6f9ca48dd
FIX missing fk_bank during export of suppliers invoices
2020-04-22 12:23:26 +02:00
florian HENRY
8be14060d6
fix: avoid php notice
2020-04-22 12:08:05 +02:00
VESSILLER
cce3085a79
NEW can update contact in import model
2020-04-22 10:44:23 +02:00
Frédéric FRANCE
8ed9c30a89
clean tab/whitespace
2020-04-22 09:02:02 +02:00
Laurent Destailleur
35b5ee28ef
Merge pull request #13680 from adrienjacob/patch-3
...
Add API endpoints for supplier invoice lines
2020-04-22 01:06:57 +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
292d93405d
Merge pull request #13667 from frederic34/patch-4
...
Update 11.0.0-12.0.0.sql
2020-04-22 01:04:24 +02:00
Laurent Destailleur
5a42af1e07
Merge pull request #13674 from adrienjacob/patch-2
...
FIX Delete extra fields for supplier invoice line
2020-04-22 00:59:57 +02:00
Laurent Destailleur
ae519a1009
Update fournisseur.facture.class.php
2020-04-22 00:59:22 +02:00
Laurent Destailleur
735bf4dc2d
Merge pull request #13683 from frederic34/patch-7
...
Update modMyModule.class.php
2020-04-22 00:57:59 +02:00
Laurent Destailleur
cea24db829
Merge pull request #13684 from frederic34/patch-8
...
Update modulebuilder.lang for typo
2020-04-22 00:56:00 +02:00
Laurent Destailleur
f52408cec1
Look and feel v12
2020-04-22 00:55:38 +02:00
Laurent Destailleur
5c573e197b
Look and feel v12
2020-04-22 00:50:04 +02:00
Laurent Destailleur
39345a574e
Merge pull request #13681 from frederic34/patch-6
...
fix phpunit usergroup class
2020-04-22 00:39:18 +02:00
Laurent Destailleur
3e2f0d0156
Merge pull request #13665 from joseplluis/patch-6
...
FIX type member extrafields are duplicated on edit
2020-04-22 00:37:50 +02:00
Laurent Destailleur
11e9cc68b7
Merge pull request #13666 from frederic34/patch-1
...
Rename llx_c_shipment_package_type to llx_c_shipment_package_type.sql
2020-04-22 00:37:19 +02:00
Laurent Destailleur
e8ead1d924
Update expensereport.class.php
2020-04-22 00:36:46 +02:00
Frédéric FRANCE
8f42707220
Update pdf_crabe.modules.php
2020-04-21 23:20:11 +02:00
Frédéric FRANCE
7972a35e36
Update pdf_azur.modules.php
2020-04-21 23:12:12 +02:00
Frédéric FRANCE
2fde77703d
add extrafields in note for enstein
2020-04-21 23:06:41 +02:00
Laurent Paumier
cf05796f31
FIX #13027 expensereport status in generated pdf
2020-04-21 23:01:21 +02:00
Frédéric FRANCE
14cdf19bf5
Update modulebuilder.lang
2020-04-21 22:57:48 +02:00
Frédéric FRANCE
50ea0ee92a
Update modMyModule.class.php
2020-04-21 22:40:24 +02:00
Laurent Destailleur
770fca0b33
Debug the double language feature in pdf
2020-04-21 20:16:36 +02:00
Laurent Destailleur
97b0cabb14
Trans
2020-04-21 18:47:31 +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
f670a68b04
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/admin/mails.php
2020-04-21 18:29:50 +02:00
Laurent Destailleur
0b790ef327
Sync lang files
2020-04-21 18:18:07 +02:00
Frédéric FRANCE
86e5713233
Update card.php
2020-04-21 16:26:02 +02:00
Frédéric FRANCE
d3c5173c5b
Update usergroup.class.php
2020-04-21 16:14:38 +02:00
stickler-ci
9f4d2ee881
Fixing style errors.
2020-04-21 14:11:33 +00:00
Adrien Jacob
23c2335396
Add API endpoints for supplier invoice lines
2020-04-21 16:07:49 +02:00
Laurent Destailleur
7b99ebfca5
Debug generic translation of fields
2020-04-21 14:54:30 +02:00
Laurent Destailleur
f6735ce8f2
Update repair.sql script
2020-04-21 14:28:52 +02:00
Laurent Destailleur
1ef89eb1a1
Fix $mysoc global not loaded.
2020-04-21 14:14:49 +02:00
Laurent Destailleur
536ab95207
FIX: The "test smtp connectivity" failed on page to setup mass emailing
...
Conflicts:
htdocs/admin/mails.php
2020-04-21 12:50:20 +02:00
Sekan, Tobias
b0ec9c1fcf
Cleanup user rights on supplier proposal card
2020-04-21 12:45:07 +02:00
Sekan, Tobias
06556fe14c
indent + comments
2020-04-21 12:25:44 +02:00
Sekan, Tobias
7de4f4d0bb
Cleanup user rights on forun commande card
2020-04-21 12:13:15 +02:00
Laurent Destailleur
f8ae5d9972
Fix Do not show value if null
2020-04-21 12:00:14 +02:00
Laurent Destailleur
ff5bf040e8
FIX text version of html emailing (removed the body style)
2020-04-21 11:19:27 +02:00
Sekan, Tobias
104e786a79
cleanup user rights on forun facture card
2020-04-21 10:02:18 +02:00
stickler-ci
d4a8718e6c
Fixing style errors.
2020-04-21 08:00:14 +00:00
Adrien Jacob
5353082154
FIX Delete extra fields for supplier invoice line
2020-04-21 09:57:45 +02:00
Lenin Rivas
b469775718
More Presition to 8 decimals
2020-04-21 01:21:08 -05:00
Lenin Rivas
f3ebc33d1e
Fix calculator to consume with to produce
...
i.e. to produce 100 then Order can be produce 135.
2020-04-21 01:14:02 -05: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
Laurent Destailleur
cadb52c5b3
Look and feel v12
2020-04-20 19:39:34 +02:00
Frédéric FRANCE
b0069f4fed
Update 11.0.0-12.0.0.sql
2020-04-20 18:46:11 +02:00
Frédéric FRANCE
f09fa5226a
Rename llx_c_shipment_package_type to llx_c_shipment_package_type.sql
2020-04-20 18:43:05 +02:00
Laurent Destailleur
230fe26b58
Look and feel v12
2020-04-20 18:38:25 +02:00
Josep Lluís
e1f1e2bf97
FIX type member extrafields are duplicated on edit
...
type member extrafields are duplicated on edit, and old usage on create (without tpl)
2020-04-20 17:50:19 +02:00
stickler-ci
f4d1ca94b3
Fixing style errors.
2020-04-20 14:49:18 +00:00
DEMAREST Maxime (Indelog)
66ad197fc5
NEW possibility to show society info when print page
...
If global config key SHOW_SOCINFO_ON_PRINT is set, this add a block in
top of page which display basic society information when the layout for
printing is activated (print button in top bar is cliqued).
2020-04-20 16:23:54 +02:00
Laurent Destailleur
acc7c371cb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/vcard.php
htdocs/core/boxes/box_birthdays.php
htdocs/core/boxes/box_birthdays_members.php
htdocs/core/lib/date.lib.php
2020-04-20 16:10:19 +02:00
Laurent Destailleur
b8e68a5ef7
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-04-20 16:06:31 +02:00
Laurent Destailleur
1e0e4d5d6d
Merge pull request #13653 from atm-maxime/fix_box_birthdays
...
Fix birthdays boxes and filter on month
2020-04-20 16:04:52 +02:00
Laurent Destailleur
4cd5a1d885
Merge pull request #13661 from frederic34/patch-1
...
remove debug
2020-04-20 16:03:25 +02:00
gauthier
b72651fdfd
FIX : we must export company mail address on contact vcard only if contact email address is empty
2020-04-20 15:59:44 +02:00
Laurent Destailleur
67a7d6b77d
Look and feel v12
2020-04-20 15:57:15 +02:00
Frédéric FRANCE
9697085f12
remove debug
2020-04-20 15:36:08 +02:00
Laurent Destailleur
16e46c672c
Clean code
2020-04-20 15:06:27 +02:00
Laurent Destailleur
98f370034a
Look and feel v12
2020-04-20 14:53:17 +02:00
Laurent Destailleur
2922d16ca2
Look and feel v12
2020-04-20 14:46:02 +02:00
Laurent Destailleur
40b3db940c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-20 14:44:36 +02:00
stickler-ci
27aeaaecb5
Fixing style errors.
2020-04-20 14:42:13 +02:00
Adrien Jacob
91fbccb594
[BUGFIX] Allow update of extra fields
...
This is to make supplier invoices consistent with other similar classes
2020-04-20 14:42:08 +02:00
Laurent Destailleur
dd67973171
Merge pull request #13659 from adrienjacob/patch-1
...
[BUGFIX] Allow update of extra fields
2020-04-20 14:41:21 +02:00
Laurent Destailleur
b90217d860
Merge pull request #13655 from frederic34/patch-4
...
fix indent
2020-04-20 14:38:17 +02:00
Frédéric FRANCE
f546103c01
make dolistore happy again
2020-04-20 14:37:52 +02:00
Laurent Destailleur
e16ceef065
Merge pull request #13656 from frederic34/patch-6
...
make dolistore happy again
2020-04-20 14:36:50 +02:00
Laurent Destailleur
c31fdd26b9
Merge pull request #13654 from frederic34/patch-1
...
Update interface_80_modStripe_Stripe.class.php
2020-04-20 14:35:24 +02:00
Laurent Destailleur
dfd1711f53
Update interface_80_modStripe_Stripe.class.php
2020-04-20 14:35:11 +02:00
jribal
924b8fd138
add project object dependency
...
Dependency was missing. Webapp seems fine but api fails.
2020-04-20 13:21:12 +01:00
stickler-ci
36385e3b88
Fixing style errors.
2020-04-20 12:16:34 +00:00
Adrien Jacob
68702f8053
[BUGFIX] Allow update of extra fields
...
This is to make supplier invoices consistent with other similar classes
2020-04-20 14:12:08 +02:00
Laurent Destailleur
c7fab6a83e
Fix no tooltip of not predefined products
2020-04-20 13:26:06 +02:00
Laurent Destailleur
b92c03cdf6
Fix Look and feel v12
2020-04-20 13:20:09 +02:00
Laurent Destailleur
f816fae86c
Fix a duplicated index
2020-04-20 12:21:13 +02:00
Laurent Destailleur
afc04faa64
Fix nb of open tickets
2020-04-20 04:26:16 +02:00
Laurent Destailleur
78474af486
Link missing
2020-04-20 03:14:44 +02:00
Laurent Destailleur
d847f67e45
Look and feel v12
2020-04-20 03:10:26 +02:00
Laurent Destailleur
fe674f08d9
Fix option WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER
2020-04-20 03:00:10 +02:00
Laurent Destailleur
8d59ce2e03
Look and feel v12
2020-04-20 02:48:05 +02:00
Laurent Destailleur
f53dd01d09
Fix css
2020-04-20 02:15:36 +02:00
Laurent Destailleur
fa056e59df
Look and feel v12
2020-04-20 02:14:43 +02:00
Laurent Destailleur
6472f521ac
css
2020-04-20 00:54:38 +02:00
Frédéric FRANCE
350e75f283
make dolistore happy again
2020-04-19 22:05:47 +02:00
Frédéric FRANCE
7b68a2a60e
Update pdf_crabe.modules.php
2020-04-19 21:50:52 +02:00
Frédéric FRANCE
5992318af7
Update card.php
2020-04-19 21:49:37 +02:00
Frédéric FRANCE
61e76ef25e
Update api_bankaccounts.class.php
2020-04-19 21:47:30 +02:00
Frédéric FRANCE
ca3402c4cf
Update interface_80_modStripe_Stripe.class.php
2020-04-19 21:33:31 +02:00
Laurent Destailleur
08260cb7a4
Look and feel
2020-04-19 15:52:43 +02:00
Laurent Destailleur
7b68d4260c
Fix permission on button
2020-04-19 15:50:32 +02:00
Laurent Destailleur
4bbe307b41
Look and feel v12
2020-04-19 15:34:53 +02:00
Laurent Destailleur
8117f37e46
Fix
2020-04-19 14:39:37 +02:00
Laurent Destailleur
9ad086ac3c
Look and feel v12
2020-04-19 14:39:15 +02:00
Laurent Destailleur
0a3d570583
Look and feel v12
2020-04-19 14:29:18 +02:00
Laurent Destailleur
d3598380da
Fix do not use hard coded link
2020-04-19 14:23:31 +02:00
Laurent Destailleur
200c29bd14
Fix some regression with new architecture for groups
2020-04-19 14:19:34 +02:00
Maxime Kohlhaas
817e16d652
Fix birthdays boxes and filter on month
2020-04-18 20:01:18 +02:00
Laurent Destailleur
01f96b35ed
Fix reposition
2020-04-18 16:50:36 +02:00
Laurent Destailleur
19815850c0
Look and feel v12
...
Fix error report
2020-04-18 16:48:49 +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
e230a3a264
add num row test
2020-04-18 16:24:12 +02:00
Laurent Destailleur
018cfdf54b
FIX Field balance before and after sometimes not visible in bank entries
2020-04-18 16:14:37 +02:00
ATM john
f2435f6247
Move methods to cunits class
2020-04-18 16:08:26 +02:00
Laurent Destailleur
de74c447cc
Fix sanitize amount
2020-04-18 16:05:26 +02:00
Laurent Destailleur
16806da9b5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-18 15:49:56 +02:00
Laurent Destailleur
f0f28c83cd
Add fk
2020-04-18 15:49:40 +02:00
Laurent Destailleur
f6e77fc0ba
Merge pull request #13602 from oscim/patch-37
...
Update llx_commandedet.key.sql
2020-04-18 15:48:53 +02:00
Laurent Destailleur
e050429854
Update llx_commandedet.key.sql
2020-04-18 15:48:45 +02:00
Laurent Destailleur
2f2e3d5057
Merge pull request #13145 from atm-john/12.0_new_extend_retained_warranty
...
NEW : Extend retained warranty to be available for all invoices
2020-04-18 15:32:33 +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
395446a924
Add getRows method and comments
2020-04-18 13:44:13 +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
47ff3f866a
css
2020-04-18 12:54:28 +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
07ce3fc34d
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
2020-04-18 11:08:21 +02:00
Laurent Destailleur
0ab8c47988
css
2020-04-18 11:07:57 +02:00
Laurent Destailleur
23876684cb
Responsive
2020-04-18 11:06:28 +02:00
Laurent Destailleur
13eb1ca28d
Fix link
2020-04-18 04:40:33 +02:00
Laurent Destailleur
910aa464d4
Trans
2020-04-18 00:38:37 +02:00
Laurent Destailleur
b0515c626b
Look and feel v12
2020-04-18 00:09:24 +02:00
Laurent Destailleur
ee26390f89
Look and feel v12
2020-04-17 19:15:22 +02:00
Laurent Destailleur
6fd34f592d
Fix default value
2020-04-17 19:07:30 +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
ea60d0be63
FIX #13618
2020-04-17 10:27:38 +02:00
Laurent Destailleur
3e7f0b364e
FIX #13611
2020-04-17 10:22:08 +02:00
Laurent Destailleur
15e3601336
Fix str_replace
2020-04-17 00:49:22 +02:00
Laurent Destailleur
d4c18c79fb
Add option WEBSITE_ADD_CSS_TO_BODY to add a CSS on body tag
2020-04-17 00:42:01 +02:00
ATM john
3b4b30ea57
Fix merge remaining lines
2020-04-16 20:33:53 +02:00
ATM john
c334a931de
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-04-16 20:29:54 +02:00
Laurent Destailleur
619014726e
Fix char of account of us
2020-04-16 17:19:18 +02:00
Laurent Destailleur
231c1ba9c1
Merge pull request #13614 from Fred-Zweig/develop
...
Added basic charts of accounts for USA and Canada.
2020-04-16 16:15:28 +02:00
Alexandre SPANGARO
b607c83b8a
Fix : Accountancy - Error on buy accountancy account suggest
2020-04-16 16:13:52 +02:00
Laurent Destailleur
d176840bfb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-16 16:02:28 +02:00
Laurent Destailleur
3c29a7b8d8
Fix phpcs
2020-04-16 16:02:06 +02:00
Laurent Destailleur
5254a94038
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/ldap.php
htdocs/commande/class/commande.class.php
htdocs/commande/index.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/expedition/list.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/list.php
htdocs/loan/list.php
htdocs/product/class/product.class.php
htdocs/supplier_proposal/list.php
2020-04-16 15:58:59 +02:00
Laurent Destailleur
01ec8693f2
Trans
2020-04-16 15:48:05 +02:00
Laurent Destailleur
855ac5467c
FIX setup of suggested payment mode on proposals and orders
2020-04-16 15:40:16 +02:00
Laurent Destailleur
26022f062f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-04-16 15:24:23 +02:00
Laurent Destailleur
984fa0d5a0
Fix hidden const
2020-04-16 15:24:12 +02:00
Laurent Destailleur
9eb737d02e
Trans
2020-04-16 14:49:27 +02:00
Laurent Destailleur
9c77243d66
Trans
2020-04-16 14:47:23 +02:00
Laurent Destailleur
56996b4aa5
trans
2020-04-16 14:42:08 +02:00
Laurent Destailleur
1d0b532437
Fix css
2020-04-16 14:31:30 +02:00
Laurent Destailleur
803b0eb3bd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-16 12:39:45 +02:00
Laurent Destailleur
dd50083a81
Look and feel v12
2020-04-16 12:39:34 +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
702f1f1a35
Merge pull request #13627 from ptibogxiv/patch-335
...
NEW API filter bankaccounts by category
2020-04-16 01:02:44 +02:00
Laurent Destailleur
f3de300483
Merge pull request #13626 from ptibogxiv/patch-334
...
NEW API filter projects by category
2020-04-16 01:01:58 +02:00
Laurent Destailleur
c413013db8
Merge pull request #13625 from ptibogxiv/patch-333
...
NEW API filter warehouses by categorie
2020-04-16 01:01:44 +02:00
Laurent Destailleur
5d53415dfc
Merge pull request #13624 from ptibogxiv/patch-332
...
NEW API filter members by category
2020-04-16 01:01:28 +02:00
Laurent Destailleur
9c792060a2
Merge pull request #13623 from ptibogxiv/patch-331
...
NEW API filter user by category
2020-04-16 01:01:04 +02:00
Laurent Destailleur
7d9c10251c
Merge pull request #13622 from ptibogxiv/patch-330
...
NEW API filter contacts by category
2020-04-16 01:00:33 +02:00
Laurent Destailleur
f8b8975811
Merge pull request #13621 from ptibogxiv/patch-329
...
NEW API filter thirdpartie by category
2020-04-16 00:59:50 +02:00
Laurent Destailleur
7f746af10e
Merge pull request #13620 from atm-quentin/FIX_draftordered_replenish
...
FIX draftordered replenish virtual stock
2020-04-16 00:58:23 +02:00
Laurent Destailleur
dd53fcf3ee
Merge pull request #13612 from atm-maxime/new_user_hr_tab
...
New add personal email and phone on user card
2020-04-16 00:54:37 +02:00
Laurent Destailleur
6a5b5d77a8
Merge pull request #13615 from pstructures/pstructures-boolean-addupdatedelete
...
Added support for Boolean common field types
2020-04-16 00:52:54 +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
Laurent Destailleur
b540bb29e0
Merge pull request #13617 from atm-quentin/11.0_viewstatut_to_search_status
...
FIX viewstatut to search status
2020-04-16 00:48:12 +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
43c48727e2
Fix var_dump
2020-04-15 23:44:07 +02:00
Laurent Destailleur
43ec6c3ae5
Fix phpcs
2020-04-15 23:38:14 +02:00
Laurent Destailleur
86eaa78f1e
FIX Use of image into free text for PDF if DOL_DATA_DIR is outside of
...
DOL_DOCUMENT_DIR.
2020-04-15 20:00:27 +02:00
ptibogxiv
84989c5cf0
Update api_projects.class.php
2020-04-15 19:33:33 +02:00
ptibogxiv
284f269213
Update api_bankaccounts.class.php
2020-04-15 19:32:45 +02:00
stickler-ci
c92263ea77
Fixing style errors.
2020-04-15 17:30:39 +00:00
ptibogxiv
0379f0fa16
NEW API filter projects by category
2020-04-15 19:29:00 +02:00
stickler-ci
63fa83e0c6
Fixing style errors.
2020-04-15 17:25:49 +00:00
ptibogxiv
47069a0575
Update api_thirdparties.class.php
2020-04-15 19:24:16 +02:00
ptibogxiv
d56785e9dc
Update api_thirdparties.class.php
2020-04-15 19:23:04 +02:00
stickler-ci
ec84303e8c
Fixing style errors.
2020-04-15 17:05:37 +00:00
ptibogxiv
d05a00bd0a
Update api_thirdparties.class.php
2020-04-15 19:03:40 +02:00
stickler-ci
7a8db9c7d9
Fixing style errors.
2020-04-15 16:41:42 +00:00
ptibogxiv
0c106cbc12
NEW API filter warehouses by categorie
2020-04-15 18:40:01 +02:00
stickler-ci
2849d00b4d
Fixing style errors.
2020-04-15 16:39:15 +00:00
ptibogxiv
f6174ddf4a
NEW API filter members by category
2020-04-15 18:37:20 +02:00
stickler-ci
a098dab5a9
Fixing style errors.
2020-04-15 16:32:07 +00:00
ptibogxiv
d1957e1a05
Update api_thirdparties.class.php
2020-04-15 18:31:20 +02:00
ptibogxiv
03655ffe8d
Update api_contacts.class.php
2020-04-15 18:30:51 +02:00
ptibogxiv
be4a5ccd2f
NEW API filter user by category
2020-04-15 18:30:13 +02:00
stickler-ci
81bed88cb1
Fixing style errors.
2020-04-15 16:28:02 +00:00
ptibogxiv
9b100cb806
NEW API filter contacts by category
2020-04-15 18:26:07 +02:00
stickler-ci
78c5011a71
Fixing style errors.
2020-04-15 16:20:42 +00:00
ptibogxiv
864205771b
NEW API filter thirdparty by category
2020-04-15 18:18:20 +02:00
Laurent Destailleur
0d97d88da0
Increase size of small image
2020-04-15 18:12:34 +02:00
atm-quentin
18fdf3573f
FIX draftordered replenish virtual stock
2020-04-15 16:05:50 +02:00
atm-quentin
f7c07640dd
viewstatut to search_status
2020-04-15 15:01:00 +02:00
Laurent Destailleur
95cf8b6359
FIX Non expected switch from tab timesptent to tab tasks
2020-04-15 14:54:54 +02:00
Matt Sidnell
98ffdfd1c4
Added Boolean Support
...
Added support to convert Boolean from 'on' to 1 in order for compatibility with the common object.
2020-04-15 12:53:39 +01:00
Laurent Destailleur
e26124bf84
Clean code to make option TICKET_NOTIFICATION_EMAIL_TO easier to
...
understand
2020-04-15 12:57:33 +02:00
Laurent Destailleur
f2e90c6657
Look and feel v12
2020-04-15 12:32:59 +02:00
Frederick Jost Zweig
49d5469904
Added basic charts of accounts for USA and Canada.
2020-04-15 13:29:51 +03:00
Laurent Destailleur
7f54c28cdb
Responsive
2020-04-15 12:13:29 +02:00
Laurent Destailleur
c93681ed33
Responsive
2020-04-15 11:51:43 +02:00
ATM john
e6669348e1
Fix dom manipulation on creation
2020-04-15 11:09:34 +02:00
ATM john
4b4f69c76a
fix indentation
2020-04-15 10:52:28 +02:00
stickler-ci
e6b29aa0f0
Fixing style errors.
2020-04-15 08:48:45 +00:00
ATM john
a9c9292137
Merge branch '12.0_new_extend_retained_warranty' of github.com:atm-john/dolibarr into 12.0_new_extend_retained_warranty
2020-04-15 10:45:53 +02:00
ATM john
9a1993f71c
Fix retained warranty default value
2020-04-15 10:44:07 +02:00
Maxime Kohlhaas
6e96cbc98d
New add personal email and phone on user card
2020-04-15 10:35:21 +02:00
Maxime Kohlhaas
a93a5bd6e1
Merge branch 'new_fields_on_group' of github.com:atm-maxime/dolibarr into new_fields_on_group
2020-04-15 08:45:10 +02:00
Maxime Kohlhaas
7fea2bc557
Update changelog + trigger name change for class UserGroup
2020-04-15 08:44:29 +02:00
Laurent Destailleur
4c4c4f8bd6
Doc
2020-04-15 03:39:40 +02:00
Laurent Destailleur
6e9cbe5b70
Fix RSS for blogs
2020-04-15 03:32:49 +02:00
Laurent Destailleur
53ceef5b6a
FIX XSS Vulnerability
2020-04-15 02:32:55 +02:00
Laurent Destailleur
3be426be5b
Align sponge and crabe
2020-04-15 02:24:08 +02:00
Laurent Destailleur
1dd951495b
Removed hard coded dependency on an external module
2020-04-15 02:20:57 +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
Laurent Destailleur
c337bd91fe
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-14 21:58:13 +02:00
Laurent Destailleur
c3b8949e2e
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
2020-04-14 21:57:20 +02:00
Laurent Destailleur
85bea5a7c4
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-04-14 21:54:27 +02:00
Laurent Destailleur
110787d66a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-04-14 21:54:16 +02:00
Laurent Destailleur
d143bd8aec
FIX #13589 missing price_level in import of thirdparties
2020-04-14 21:22:08 +02:00
stickler-ci
cbf6afb4a0
Fixing style errors.
2020-04-14 12:13:38 +00:00
ATM john
b70cd84402
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-04-14 14:11:12 +02:00
Sekan, Tobias
3482d24ee7
Fix not working ATOM feeds
2020-04-14 10:45:52 +02:00
oscim
f4c346cdbb
Update llx_commandedet.key.sql
...
add external key
2020-04-14 07:48:34 +02:00
Josep Lluís
eda398b1cb
FIX translation key ErrorPrefixRequired
...
The correct translation key is ErrorPrefixRequired
2020-04-14 07:01:53 +02:00
Laurent Destailleur
8363b1a50e
fix search
2020-04-14 00:03:13 +02:00
Laurent Destailleur
f8f4b748ee
Update exemple
2020-04-13 23:21:28 +02:00
Laurent Destailleur
5772057723
Page to import template easier to understand.
2020-04-13 22:52:34 +02:00
stickler-ci
92b6b6e1f5
Fixing style errors.
2020-04-13 17:16:14 +00:00
Maxime Kohlhaas
261e6cbc52
Fix delete extrafield test
2020-04-13 19:08:03 +02:00
Maxime Kohlhaas
b8a0b4b6e4
New class UserGroup works with common functions now
2020-04-13 19:03:48 +02:00
Maxime Kohlhaas
2e004e93ea
Commonobject : delete extrafields + syslog
2020-04-13 19:02:19 +02:00
Laurent Destailleur
dc86f9528d
Fix MRP module
2020-04-13 18:10:20 +02:00
Laurent Destailleur
0878ee3a0f
Look and feel v12
2020-04-13 17:55:25 +02:00
Laurent Destailleur
2c4bb867b3
FIX #12996
2020-04-13 17:36:12 +02:00
Laurent Destailleur
98235e726a
Merge pull request #13597 from ptibogxiv/patch-328
...
NEW setup template email notification
2020-04-13 17:35:49 +02:00
stickler-ci
3a029001f4
Fixing style errors.
2020-04-13 14:23:29 +00:00
Laurent Destailleur
8c8a8263dd
Merge branch 'develop' into patch-145
2020-04-13 16:22:19 +02:00
Laurent Destailleur
99cbb273c8
Update pdf_crabe.modules.php
2020-04-13 16:21:47 +02:00
ptibogxiv
e589642120
NEW setup template email notification
2020-04-13 16:20:22 +02:00
Laurent Destailleur
76fd1fb105
FIX #12996
2020-04-13 16:13:02 +02:00
Laurent Destailleur
f2704036cd
FIX #13517
2020-04-13 16:00:41 +02:00
Laurent Destailleur
e02ac3b518
Trans
2020-04-13 15:57:25 +02:00
Laurent Destailleur
6e92eb4397
Fix descriptor of module was visible for external module only
2020-04-13 15:43:37 +02:00
Maxime Kohlhaas
26befa3b93
New fields on usergroup object + card uses common tpl
2020-04-13 15:38:50 +02:00
Laurent Destailleur
2d59991113
Fix translation
2020-04-13 15:32:14 +02:00
Laurent Destailleur
fcf467989d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expedition/class/api_shipments.class.php
2020-04-13 15:16:55 +02:00
Laurent Destailleur
73f2132dca
Clsoe #13464 Try implementation to allow use of objectonoff for most
...
modules.
2020-04-13 15:13:39 +02:00
Laurent Destailleur
236898f4e7
FIX #13503
2020-04-13 14:55:37 +02:00
Laurent Destailleur
a72b262f5b
FIx #13592
...
Conflicts:
htdocs/compta/bank/line.php
2020-04-13 14:52:06 +02:00
Laurent Destailleur
4ab3bf99ec
FIx #13592
2020-04-13 14:50:55 +02:00
Laurent Destailleur
b54e3fb18c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-13 14:39:10 +02:00
Laurent Destailleur
f726fcdcd8
FIX #13593
2020-04-13 14:32:15 +02:00
Laurent Destailleur
1c6faf79a9
FIX #13595
2020-04-13 14:23:57 +02:00
Laurent Destailleur
057a4517c9
Fix rss
2020-04-13 13:38:57 +02:00
Laurent Destailleur
93a3a03dd2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-13 13:32:25 +02:00
Laurent Destailleur
862977bd94
Fix css
2020-04-13 13:32:09 +02:00
Laurent Destailleur
6bc87d6277
Merge pull request #13591 from TobiasSekan/ShowActiveBoxStateOfRssFeed
...
NEW Show active widget state of a RSS feed
2020-04-13 13:29:40 +02:00
Laurent Destailleur
36669739f3
Update external_rss.php
2020-04-13 13:29:23 +02:00
Laurent Destailleur
9adb1b0dac
Merge pull request #13590 from frederic34/patch-1
...
create rum with api when create thirdparty bank account
2020-04-13 13:26:22 +02:00
Scrutinizer Auto-Fixer
387ea73bf3
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-13 11:24:42 +00:00
Laurent Destailleur
3424c33af1
Fix scrutinizer
2020-04-13 13:23:28 +02:00
Laurent Destailleur
f69aaa242b
Fix scrutinizer
2020-04-13 13:10:15 +02:00
Laurent Destailleur
02e4d2ef54
css
2020-04-13 13:03:08 +02:00
stickler-ci
cfbb4e9ef6
Fixing style errors.
2020-04-13 08:55:33 +00:00
Sekan, Tobias
e130faf012
Show active box state of a RSS feed
2020-04-13 10:36:24 +02:00
Frédéric FRANCE
5933d2282c
Update api_thirdparties.class.php
2020-04-13 09:39:31 +02:00
Frédéric FRANCE
1114f0ee3d
Update api_thirdparties.class.php
2020-04-13 09:25:06 +02:00
Frédéric FRANCE
8c8afa4b46
Update api_thirdparties.class.php
2020-04-13 09:15:01 +02:00
Laurent Destailleur
2bf36bff6d
Fix restore dir at good place
2020-04-13 04:19:25 +02:00
Laurent Destailleur
3740d59848
Look and feel v12
2020-04-13 04:14:28 +02:00
Laurent Destailleur
b5abc9de00
css
2020-04-13 03:18:14 +02:00
Laurent Destailleur
47b034079a
Look and feel v12
2020-04-13 03:14:01 +02:00
Laurent Destailleur
96d087c99d
Fix clean event report
2020-04-13 02:59:33 +02:00
Laurent Destailleur
d0dbf323ed
css
2020-04-13 01:42:10 +02:00
Laurent Destailleur
db11f0f58d
CSS
2020-04-13 01:17:51 +02:00
Laurent Destailleur
596ba8d679
Clean deprecated code.
2020-04-13 01:10:35 +02:00
Laurent Destailleur
ae1e4073ad
Debug custom report tool
2020-04-13 00:33:50 +02:00
Laurent Destailleur
09641bd606
Fix replacement
2020-04-13 00:06:25 +02:00
Laurent Destailleur
8842a1f4e7
css
2020-04-12 23:41:35 +02:00
Laurent Destailleur
d503c1b6be
Fix help
2020-04-12 23:18:21 +02:00
Laurent Destailleur
72623f88df
Fix phpcs
2020-04-12 22:54:39 +02:00
Laurent Destailleur
cdc8eb27fb
Look and feel v12
2020-04-12 21:45:43 +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
384cfeccf6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-04-12 21:38:51 +02:00
Laurent Destailleur
46ccd61009
Fix phpcs
2020-04-12 21:38:23 +02:00
Laurent Destailleur
549b126eff
Look and feel v12
2020-04-12 21:36:57 +02:00
Laurent Destailleur
ed51ce8734
Look and feel v12
2020-04-12 19:56:50 +02:00
Laurent Destailleur
52b467d2fc
FIX #13550 Removed not used table
2020-04-12 19:06:44 +02:00
Laurent Destailleur
b6baba7651
Removed deprecated var
2020-04-12 18:59:22 +02:00
Laurent Destailleur
4bfc900798
Look and feel v12
2020-04-12 18:41:42 +02:00
Laurent Destailleur
a2cc7aca1a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-12 18:36:32 +02:00
Laurent Destailleur
239ae78b28
Look and feel v12
2020-04-12 18:36:22 +02:00
Laurent Destailleur
8aa6ce0098
Merge pull request #13587 from frederic34/patch-1
...
The variable $rep seems to be never defined.
2020-04-12 18:19:40 +02:00
Laurent Destailleur
0f71ee1e49
Merge pull request #13563 from simicar29/11.0
...
FIX #7594 Expense report multi pagebreak
2020-04-12 18:19:23 +02:00
Laurent Destailleur
d47c566c4d
Fix class not found
2020-04-12 18:15:38 +02:00
Laurent Destailleur
92b6b1a042
Look and feel v12
2020-04-12 18:13:43 +02:00
Frédéric FRANCE
ea78fc48a8
The variable $rep seems to be never defined.
2020-04-12 18:03:51 +02:00
Laurent Destailleur
ecd49c21c9
Look and feel v12
2020-04-12 17:32:22 +02:00
Laurent Destailleur
e18d6bd6b8
Look and feel v12
2020-04-12 17:28:10 +02:00
Laurent Destailleur
313df360b2
Merge pull request #13566 from atm-maxime/new_user_bank_mgmt
...
New display of user bank account : same way as on thirdparty
2020-04-12 17:22:01 +02:00
Laurent Destailleur
afbfd66ee9
Merge pull request #13581 from atm-maxime/fix_expedition_warning_count
...
Fix warning on shipment because of count func
2020-04-12 17:21:28 +02:00
Laurent Destailleur
38a8cf9bc9
Merge pull request #13575 from frederic34/catmod
...
NEW Show creator, last update user of category/tag in the infoirmation tab
2020-04-12 17:21:04 +02:00
Laurent Destailleur
4a6ffd2619
Merge pull request #13570 from frederic34/patch-6
...
Add table_ref_field to facture-rec class
2020-04-12 17:17:43 +02:00
Laurent Destailleur
08301e2696
Merge pull request #13567 from atm-maxime/new_expensereport_tab_remove
...
Remove expense report tab from user
2020-04-12 17:11:37 +02:00
stickler-ci
a873afdad9
Fixing style errors.
2020-04-12 15:08:44 +00:00
Laurent Destailleur
51f73526f9
Merge branch 'develop' into patch-8
2020-04-12 17:07:57 +02:00
Laurent Destailleur
fe4cd2e7bc
Update actioncomm.class.php
2020-04-12 17:05:12 +02:00
Laurent Destailleur
8e6de35d7b
Merge pull request #13568 from atm-maxime/10.0
...
FIX #13535 : state in italian address
2020-04-12 17:03:24 +02:00
Laurent Destailleur
27782a244c
Merge pull request #13565 from andreubisquerra/develop
...
4 rows of actions buttons in TakePOS
2020-04-12 17:02:28 +02:00
Laurent Destailleur
78b455e42a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-12 17:01:53 +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
8e246f2a18
Prepare 11.0.4
2020-04-12 16:54:54 +02:00
Laurent Destailleur
acbbffdb7f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-04-12 16:54:15 +02:00
Laurent Destailleur
1cda760621
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
2020-04-12 16:54:09 +02:00
Laurent Destailleur
94ae75c2a0
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-04-12 16:53:07 +02:00
Laurent Destailleur
eebf48b27c
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
2020-04-12 16:52:58 +02:00
Laurent Destailleur
2e27355dec
FIX #13569
2020-04-12 16:51:35 +02:00
Laurent Destailleur
b1bae5f3dd
Merge pull request #13569 from tuxgasy/Fix_breaking_selectForFormsList
...
Keep compatibility with old object declaration
2020-04-12 16:48:08 +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
faa9b98b39
Merge pull request #13571 from frederic34/patch-7
...
Add table_ref_field to fichinterrec class
2020-04-12 16:41:48 +02:00
Laurent Destailleur
b60ed2ca05
Merge pull request #13574 from andreubisquerra/master
...
TakePOS connector update
2020-04-12 16:39:44 +02:00
Laurent Destailleur
3cc68c6972
Merge pull request #13579 from atm-maxime/fix_variants_links
...
Fix #13576 : links on variants
2020-04-12 16:38:56 +02:00
Laurent Destailleur
a38e273ae8
Merge pull request #13583 from atm-maxime/fix_default_workdayhour
...
Fix #13468 setup working days and hours
2020-04-12 16:38:36 +02:00
Laurent Destailleur
51eea01505
Merge pull request #13584 from pstructures/develop
...
Installation issue
2020-04-12 16:38:08 +02:00
Laurent Destailleur
4640eb3fe2
Merge pull request #13578 from frederic34/patch-14
...
Update llx_categorie_website_page.key.sql
2020-04-12 16:37:43 +02:00
Laurent Destailleur
d842c7d603
Merge pull request #13585 from frederic34/patch-15
...
doxygen
2020-04-12 16:36:37 +02:00
Laurent Destailleur
7d430c08d0
Look and feel v12
2020-04-12 16:36:25 +02:00
Frédéric FRANCE
044a6192b6
doxygen
2020-04-12 16:26:19 +02:00
Matt Sidnell
7c72e40659
Installation issue
...
Installation SQL issue due to a ';' instead of a ','.
2020-04-12 15:21:14 +01:00
Maxime Kohlhaas
20e684ec69
Fix #13468 setup working days and hours
2020-04-12 15:30:58 +02:00
Laurent Destailleur
0916017519
Fix addreplace hook
2020-04-12 15:29:13 +02:00
Laurent Destailleur
d7784887d1
More font awesome picto
2020-04-12 14:58:50 +02:00
Tobias Sekan
ef38b5a015
fix wrong delete code line
2020-04-12 13:59:24 +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
Maxime Kohlhaas
3ca0d48b37
Fix warning on shipment because of count func
2020-04-12 10:45:30 +02:00
Maxime Kohlhaas
8bca68cfba
Fix missing token on product composition
2020-04-12 10:39:16 +02:00
Maxime Kohlhaas
3f59ca6418
Fix #13576 : links on variants
2020-04-12 10:13:37 +02:00
Frédéric FRANCE
33a926e251
Update llx_categorie_website_page.key.sql
2020-04-12 09:08:27 +02:00
Frédéric FRANCE
a91139f2d8
add user
2020-04-12 00:57:08 +02:00
Frédéric FRANCE
c06cf2eb8d
info categorie
2020-04-12 00:47:14 +02:00
Frédéric FRANCE
b05ea6573e
info categorie
2020-04-12 00:37:05 +02:00
Frédéric FRANCE
251f6d0cb1
Update facture-rec.class.php
2020-04-11 22:53:45 +02:00
andreubisquerra
323a62f1e7
travis fix
2020-04-11 22:38:59 +02:00
Frédéric FRANCE
e2660fd31c
Update actioncomm.class.php
2020-04-11 22:38:28 +02:00
andreubisquerra
5dc3b8dfd5
Travis fix
2020-04-11 22:36:46 +02:00
Frédéric FRANCE
88f18ec3ce
can't remove actioncomm if there is a category
2020-04-11 22:24:50 +02:00
jove@bisquerra.com
78b43ddb1f
TakePOS connector update
2020-04-11 22:19:36 +02:00
Frédéric FRANCE
b6ffcd0a6b
Update fichinterrec.class.php
2020-04-11 21:10:21 +02:00
Frédéric FRANCE
e9aa27d731
Update facture-rec.class.php
2020-04-11 21:06:33 +02:00
TuxGasy
fecfe2e3a1
Keep compatibility with old object declaration
2020-04-11 18:37:06 +02:00
Laurent Destailleur
6eab2ec295
Fix Replacement
2020-04-11 18:29:42 +02:00
Laurent Destailleur
ca8e1f3ea5
NEW Can replace a string into all pages in website module
2020-04-11 18:18:53 +02:00
Maxime Kohlhaas
f5ab957faf
FIX #13535 : state in italian address
2020-04-11 17:56:23 +02:00
Maxime Kohlhaas
2ef787c7ff
Remove expense report tab from user
2020-04-11 17:38:54 +02:00
stickler-ci
9744efc3ec
Fixing style errors.
2020-04-11 15:12:11 +00:00
Maxime Kohlhaas
d842a436ae
New display of user bank account : same way as on thirdparty
2020-04-11 17:06:50 +02:00
Laurent Destailleur
33a5288125
Add log
2020-04-11 16:34:59 +02:00
andreubisquerra
9270e2c614
4 rows of actions buttons in TakePOS
2020-04-11 16:31:08 +02:00
Laurent Destailleur
800a72a2b0
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-11 14:18:19 +02:00
Laurent Destailleur
4c515f726f
Can sort list of answers.
2020-04-11 14:18:09 +02:00
Laurent Destailleur
760121a3d1
Can sort list of answers.
2020-04-11 14:13:16 +02:00
simicar29
9573f1289a
FIX #7594
...
This is a temptative fix of the bad "multi page break" in expense report
2020-04-11 13:42:37 +02:00
Laurent Destailleur
1ed24d3949
Fix trans
2020-04-11 12:42:08 +02:00
Laurent Destailleur
d8e0036817
css
2020-04-11 12:41:53 +02:00
Laurent Destailleur
6a955da4e9
Merge pull request #13546 from oscim/patch-33
...
Update llx_societe.key.sql
2020-04-11 01:31:29 +02:00
Laurent Destailleur
47f00f8bc8
Update llx_societe.key.sql
...
Keep only fields that are enough discriminent for new indexes
2020-04-11 01:31:03 +02:00
Laurent Destailleur
eb63350d55
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-04-11 01:09:36 +02:00
Laurent Destailleur
450b1761b1
Fix label
2020-04-11 01:09:26 +02:00
Laurent Destailleur
9ab2adab7e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-11 00:56:29 +02:00
Laurent Destailleur
db30f0bbc4
NEW Receipt printer module moved from 'development' to 'experimental'
2020-04-11 00:56:18 +02:00
Laurent Destailleur
b3beb42857
Merge pull request #13561 from andreubisquerra/master
...
Up to 2 orders printers in TakePOS with Receipt printers module
2020-04-10 20:06:35 +02:00
Laurent Destailleur
679b94dcaa
Merge pull request #13553 from atm-quentin/11_fix_checkbox_supplier_order
...
FIX missing selectedlines on supplier order
2020-04-10 20:04:24 +02:00
Laurent Destailleur
eb3ed7ffdf
Complete index on tickets
2020-04-10 20:02:57 +02:00
Laurent Destailleur
6960f79e40
Update llx_ticket.key.sql
2020-04-10 19:59:45 +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
philazerty
0aab98abff
Index optimization for ticket
...
When there are a lot of tickets, the search can be long without these indexes.
2020-04-10 17:05:53 +02:00
philazerty
63d41fa356
Update list.php
...
Bug #13519
2020-04-10 16:48:18 +02:00
gauthier
1f471d46eb
FIX : some others modules (like subtotal) use other product_type than 0 or 1 AND must not be considered in this report
2020-04-10 15:51:51 +02:00
Laurent Destailleur
267677a925
Fix phpcs
2020-04-10 14:02:35 +02:00
Laurent Destailleur
d75f1138ba
Fix phpcs
2020-04-10 13:00:46 +02:00
Laurent Destailleur
069fb27ced
Look and feel v12
2020-04-10 12:27:34 +02:00
Laurent Destailleur
0845f0bcd3
Merge pull request #13523 from bb2a/patch-2
...
add in default search
2020-04-10 12:12:28 +02:00
Laurent Destailleur
da8cf3dcb0
Update list.php
2020-04-10 12:11:09 +02:00
atm-quentin
83f3c9ab6e
use only 1 if
2020-04-10 12:09:18 +02:00
Anthony Berton
174ef23207
Update list.php
2020-04-10 12:09:04 +02:00
Laurent Destailleur
68022fb916
css
2020-04-10 12:08:37 +02:00
Laurent Destailleur
5ff981bf61
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/user/perms.php
2020-04-10 12:04:21 +02:00
atm-quentin
28fa0e4e5d
FIX missing selectedlines on supplier order but checkbox are displayed
2020-04-10 11:55:00 +02:00
Laurent Destailleur
874cbcefc7
Fix permission to close a proposal or order was not correctly used
...
#13547
2020-04-10 11:54:14 +02:00
Laurent Destailleur
8567001a46
Merge pull request #13549 from oscim/patch-34
...
Update llx_societe_rib.key.sql
2020-04-10 11:11:13 +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
Anthony Berton
96f1c961b7
Update list.php
2020-04-10 10:55:14 +02:00
Laurent Destailleur
a2a89637a2
Fix phpcs
2020-04-10 10:53:41 +02:00
Laurent Destailleur
e454ee783f
Fix phpcs
2020-04-10 10:53:03 +02:00
Anthony Berton
8abef71616
Update list.php
2020-04-10 10:50:15 +02:00
Anthony Berton
620161f0e7
Update list.php
2020-04-10 10:47:34 +02:00
Anthony Berton
a7440687ec
Update list.php
2020-04-10 10:38:31 +02:00
oscim
2887ae3f00
Update llx_societe_rib.key.sql
...
fix key in table
2020-04-10 08:54:39 +02:00
andreubisquerra
4ac978303b
FIX TakePOS buying price
2020-04-10 08:36:16 +02:00
Laurent Destailleur
4ff503d20a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/list.php
htdocs/supplier_proposal/list.php
2020-04-10 02:07:51 +02:00
Laurent Destailleur
92cd0372db
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/societe/class/societe.class.php
2020-04-10 02:04:26 +02:00
Laurent Destailleur
a1e714f123
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/societe/class/societe.class.php
2020-04-10 02:03:12 +02:00
Laurent Destailleur
c4d898e155
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/societe/class/societe.class.php
2020-04-10 02:01:31 +02:00
Laurent Destailleur
6f4ff57612
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/supplier_proposal/list.php
2020-04-10 02:00:22 +02:00
Laurent Destailleur
5a366767fb
Fix phpcs
2020-04-10 01:47:50 +02:00
Laurent Destailleur
7fe8c7eab3
FIX #11855
2020-04-10 01:37:04 +02: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
273443550e
Fix list in warehouse
2020-04-10 01:21:59 +02:00
Laurent Destailleur
f7d1ce1e09
FIX Can use decimal value in virtual products
2020-04-10 00:26:09 +02:00
Laurent Destailleur
401b8b2dcc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-10 00:25:41 +02:00
Laurent Destailleur
80862f7173
FIX Can use decimal value in virtual products
2020-04-10 00:25:30 +02:00
Laurent Destailleur
635cd7a995
Merge pull request #13531 from defrance/patch-149
...
add linked object block
2020-04-09 20:44:02 +02:00
Laurent Destailleur
5f00f0133e
Merge pull request #13529 from bb2a/patch-4
...
Display Phone link and separ personalise in const
2020-04-09 19:54:48 +02:00
Laurent Destailleur
cbbd2399c0
Update list.php
2020-04-09 19:50:24 +02:00
Laurent Destailleur
1ed8639653
Merge pull request #13532 from atm-quentin/11_fix_buyprice_extrafield_langfile_and_tooltip
...
FIX buyprice extrafield langfile and tooltip
2020-04-09 19:49:32 +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
bc2a1d653d
Merge pull request #13542 from ptibogxiv/patch-325
...
FIX pencil with font awesome 5.13
2020-04-09 19:35:35 +02:00
Laurent Destailleur
56336e1d30
Merge pull request #13541 from fappels/11_stock_list_default_vis
...
Fix set default warehouse list columns
2020-04-09 19:35:18 +02:00
Laurent Destailleur
c83f0f7484
Merge pull request #13533 from simicar29/11.0
...
11.0
2020-04-09 19:34:31 +02:00
Laurent Destailleur
6202b0a391
Merge pull request #13528 from bb2a/patch-3
...
Link Mail in list
2020-04-09 19:33:10 +02:00
Laurent Destailleur
2e3d4f03b6
Merge pull request #13544 from andreubisquerra/develop
...
FIX TakePOS buying price
2020-04-09 19:30:53 +02:00
Laurent Destailleur
f1c391363d
Fix label
2020-04-09 18:40:00 +02:00
Laurent Destailleur
6a60678186
Look and feel v12
2020-04-09 16:36:39 +02:00
oscim
2df7d79421
Update llx_societe.key.sql
...
Add index in table for optimise search in big database
2020-04-09 15:54:25 +02:00
Francis Appels
0a8a8bafa0
FIX print pictures in shipment docs
2020-04-09 15:40:36 +02:00
ptibogxiv
5bba22aeeb
FIX pencil with font awesome 5.13
2020-04-09 14:58:42 +02:00
andreubisquerra
e43e9a0daa
FIX TakePOS buying price
2020-04-09 14:56:50 +02:00
atm-lena
c9ab61b521
FIX - Add function "completeTabsHead" to hooks "addreplace"
2020-04-09 14:54:47 +02:00
Francis Appels
caecb0152f
Fix set default warehouse list columns
2020-04-09 14:46:20 +02:00
andreubisquerra
7d11a36beb
FIX TakePOS buying price
2020-04-09 14:42:42 +02:00
Laurent Destailleur
5819aadf75
Clean html code (replace table into table with div)
2020-04-09 13:40:26 +02:00
gauthier
3327f1c074
FIX : IHM, unexpected quote
2020-04-09 11:53:03 +02:00
jove@bisquerra.com
ea79c91482
Add langs and print only no printed order lines
2020-04-08 20:02:54 +02:00
BENKE Charlene
728bfd1c90
oups ssooory
...
everything fine thank's
2020-04-08 19:46:29 +02:00
Laurent Destailleur
9a6c89d03f
Fix phpcs
2020-04-08 18:51:24 +02:00
Laurent Destailleur
b9fc642a35
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-04-08 18:32:23 +02:00
Laurent Destailleur
63f0c07a07
Add warning
2020-04-08 18:32:13 +02:00
Laurent Destailleur
361baa0c73
CSS
2020-04-08 17:56:24 +02:00
Laurent Destailleur
02436c1e84
NEW The module selection uses a KanBan view by default.
2020-04-08 17:04:23 +02:00
Laurent Destailleur
fe614658c8
Look and feel v12
2020-04-08 16:13:29 +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
stickler-ci
50b789456d
Fixing style errors.
2020-04-08 14:03:16 +00:00
atm-quentin
64f6542f96
FIX buyprice extrafield langfile and tooltip
2020-04-08 15:59:10 +02:00
BENKE Charlene
732a103ba8
add linked object block
2020-04-08 15:30:48 +02:00
Anthony Berton
97153fd57d
Update functions.lib.php
2020-04-08 15:13:19 +02:00
Laurent Destailleur
18f2087cc6
Fix look and feel v12
2020-04-08 15:13:01 +02:00
Laurent Destailleur
d257b5553e
Merge pull request #13351 from TobiasSekan/FixErrorAndSortingInContactView
...
FIX error and sorting in contact view
2020-04-08 15:03:37 +02:00
ptibogxiv
26bc5381e4
Update api_setup.class.php
2020-04-08 14:57:34 +02:00
Laurent Destailleur
a27a499727
Merge pull request #13157 from bb2a/patch-17
...
Add search order to assign to a warehouse
2020-04-08 14:54:36 +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
Anthony Berton
b1ad30cbb4
Update list.php
2020-04-08 14:51:28 +02:00
Laurent Destailleur
b8a657ec0f
Merge pull request #13509 from andreubisquerra/develop
...
Order printer with 'Receipt printers' module
2020-04-08 14:51:23 +02:00
Laurent Destailleur
bcd336d029
Merge pull request #13518 from bb2a/patch-1
...
Add custom search criteria to those default for QUICKSEARCH
2020-04-08 14:50:50 +02:00
Laurent Destailleur
5afd043ec5
Update list.php
2020-04-08 14:50:41 +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
Laurent Destailleur
12c033649a
Merge pull request #13512 from frederic34/zopflipng
...
compress png with zopflipng
2020-04-08 14:48:38 +02:00
Laurent Destailleur
3ac07ff84f
Merge pull request #13507 from atm-john/11.0_Fix_warehouse_list
...
Fix warehouse list
2020-04-08 14:44:55 +02:00
Laurent Destailleur
efd6d14c1a
Merge pull request #13505 from atm-florian/develop
...
fix php warning
2020-04-08 14:40:59 +02:00
Laurent Destailleur
7514aa4612
Merge pull request #13506 from joseplluis/patch-6
...
NEW add professional ID 1 in sepamandate document
2020-04-08 14:40:38 +02:00
Laurent Destailleur
1719647036
Merge pull request #13515 from homer8173/patch-19
...
FIX : twice call in a page
2020-04-08 14:39:28 +02:00
Laurent Destailleur
2e9b19ff8e
Merge pull request #13526 from TobiasSekan/BetterPHPModulViewAdmin
...
NEW Better php module view admin
2020-04-08 14:38:23 +02:00
Laurent Destailleur
5a59f87699
Update phpinfo.php
2020-04-08 14:37:49 +02:00
Laurent Destailleur
0716951b6d
Fix logo
2020-04-08 13:38:29 +02:00
stickler-ci
6ceb35c5c6
Fixing style errors.
2020-04-08 10:11:06 +00:00
Tobias Sekan
05ec5718bd
Fix overriden PHP POST check
2020-04-08 12:00:47 +02:00
Tobias Sekan
3e4bd31274
Update English lang
2020-04-08 11:55:58 +02:00
Tobias Sekan
4703d87c33
Update German lang
2020-04-08 11:52:01 +02:00
Tobias Sekan
3f55177add
revert last change
2020-04-08 11:50:40 +02:00
Tobias Sekan
8453080d3c
Update German lang
2020-04-08 11:47:46 +02:00
Tobias Sekan
287af6c864
Show better PHP extension info
2020-04-08 11:46:45 +02:00
Laurent Destailleur
215c7b0e32
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/langs/en_US/compta.lang
2020-04-08 11:42:43 +02:00
Laurent Destailleur
9ef6204f7e
Fix description of reports (use date of invoice not validation date)
2020-04-08 11:40:38 +02:00
Laurent Destailleur
146ead4d04
Code comment
2020-04-08 11:39:22 +02:00
Laurent Destailleur
df81065f73
MAIN_VIEW_LINE_NUMBER_IN_LIST
2020-04-08 11:23:31 +02:00
stickler-ci
0ce44251f7
Fixing style errors.
2020-04-08 08:50:16 +00:00
Tobias Sekan
a506050fee
Update English lang
2020-04-08 10:33:24 +02:00
Tobias Sekan
bbd7134a0f
Update german lang
2020-04-08 10:31:54 +02:00
Tobias Sekan
23645b7865
Add confirm for delte file in facture
2020-04-08 10:30:51 +02:00
Tobias Sekan
91483fd560
Add optional remove action for showDocuments
2020-04-08 10:24:32 +02:00
Anthony Berton
da1b8f8c44
Update list.php
2020-04-08 08:56:10 +02:00
Laurent Destailleur
1adee36314
Upgrade to font awesome 5.13
2020-04-07 21:11:18 +02:00
Laurent Destailleur
9d9364256b
More picto using fontawesome.
2020-04-07 16:45:08 +02:00
Anthony Berton
97e9913f86
Update list.php
2020-04-07 16:24:38 +02:00
Laurent Destailleur
8e7ad726b2
NEW Easier way to setup the different types of tax. Better visibility.
...
FIX edit of tax stamp regenerated the PDF.
2020-04-07 14:06:08 +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
Laurent Destailleur
ff1b3db54b
Fix regression on hamburger picto
2020-04-06 23:38:30 +02:00
Frédéric FRANCE
f5416a94b0
Merge remote-tracking branch 'upstream/develop' into zopflipng
2020-04-06 20:46:09 +02:00
andreubisquerra
5707bf0d73
NEW RECEIPT_PRINTER_NB_CHARACT_BY_LINE and FIX product label
2020-04-06 19:38:50 +02:00
andreubisquerra
bcfa752578
Fix label on 'Receipt printers' module
2020-04-06 19:16:51 +02:00
Frédéric FRANCE
fc34b5a4cb
compress png with zopflipng
2020-04-06 19:03:48 +02:00
Laurent Destailleur
0933fefa1d
More fontawesome logo
2020-04-06 18:36:33 +02:00
Laurent Destailleur
665dc6f8d2
More fontawesome logo
2020-04-06 18:16:21 +02:00
Regis Houssin
34e434a17e
FIX missing member entity
2020-04-06 16:36:11 +02:00
andreubisquerra
079bfafa26
Order printer langs
2020-04-06 16:14:01 +02:00
andreubisquerra
aec1c177e3
Order printer with 'Receipt printers' module
2020-04-06 16:07:05 +02:00
Laurent Destailleur
809c741d11
Can use font awesome as picto of object and modules.
2020-04-06 15:34:28 +02:00
Laurent Destailleur
082b205149
WIP Work on Kanban view for module list
2020-04-06 15:12:42 +02:00
ATM john
88297d5682
fix key
2020-04-06 13:20:42 +02:00
ATM john
721371a08c
Fix warehouse list
2020-04-06 13:08:03 +02:00
stickler-ci
3b9267fd8a
Fixing style errors.
2020-04-06 10:51:06 +00:00
Josep Lluís
35f3052280
NEW add VAT ID in sepamandate document
...
add: VAT ID in sepamandate document
2020-04-06 12:47:57 +02:00
florian HENRY
48da8c315f
fix php warning
2020-04-06 12:21:20 +02:00
Laurent Destailleur
41b2ed8f89
Look and feel v12
2020-04-06 12:03:37 +02:00
Laurent Destailleur
23c48b83e4
Fix change position of session_set_cookie_param / session_name
2020-04-06 11:16:35 +02:00
atm-quentin
9950295e41
FIX author search supplier proposal list
2020-04-06 10:29:04 +02:00
Laurent Destailleur
4f8b3e0646
Fix name of cookie
2020-04-06 10:02:11 +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
93ce4e9e4b
Fix phpcs
2020-04-05 15:47:34 +02:00
Laurent Destailleur
ed4aa55857
Doxygen
2020-04-05 15:46:10 +02:00
Laurent Destailleur
47987f239d
Fix trans
2020-04-05 15:42:39 +02:00
Laurent Destailleur
009cc36355
Fix sendocntext for builk action
2020-04-05 15:39:53 +02:00
Laurent Destailleur
e32ac7644d
FIX Send email from bulk action of list of thirdparties
2020-04-05 15:31:18 +02:00
Laurent Destailleur
8f4ac3d610
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-05 15:29:30 +02:00
Laurent Destailleur
0215ef9e76
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-05 15:29:24 +02:00
Laurent Destailleur
62387f712c
FIX Send email from bulk action of list of thirdparties
2020-04-05 15:26:16 +02:00
stickler-ci
1827541f88
Fixing style errors.
2020-04-05 12:04:25 +00:00
ptibogxiv
6a53e02c3c
FIX better url for get conf with REST API
...
need to be more userfriendly and similar to other api (without a variable with GET varible in URL "?confname="
2020-04-05 14:02:51 +02:00
Laurent Destailleur
e7360279b5
Merge pull request #13490 from ptibogxiv/patch-319
...
FIX preg_match for constante name
2020-04-05 12:26:08 +02:00
Laurent Destailleur
09ac3b50a7
Merge pull request #13499 from ptibogxiv/patch-322
...
NEW get documents for categories with RESP API
2020-04-05 12:25:33 +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
03b09f1d28
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-05 12:14:03 +02:00
Laurent Destailleur
e838000795
responsive
2020-04-05 12:11:58 +02:00
Laurent Destailleur
5b8c50cb72
css
2020-04-05 12:07:00 +02:00
Laurent Destailleur
5ca9c71449
css
2020-04-05 12:05:27 +02:00
Laurent Destailleur
98dfc7ca71
Fix css
2020-04-05 12:01:05 +02:00
Laurent Destailleur
13b47774e2
FIX #13424
2020-04-05 11:55:43 +02:00
ptibogxiv
6be12efd61
NEW get documents for categories with RESP API
2020-04-05 11:20:24 +02:00
ptibogxiv
7818b15151
Update api_setup.class.php
2020-04-05 10:50:38 +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
5516d747af
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-05 04:01:38 +02:00
Laurent Destailleur
87ff94fc64
Add generic fields
2020-04-05 03:59:23 +02:00
Laurent Destailleur
50790a7f36
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/filefunc.inc.php
2020-04-05 03:44:06 +02:00
Laurent Destailleur
eac75497c0
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-04-05 03:42:12 +02:00
Laurent Destailleur
d0c4af5855
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-04-05 03:42:05 +02:00
Laurent Destailleur
8a14652eae
Merge pull request #13449 from atm-quentin/FIX_missing_default_accountancy_product_buy_code
...
FIX missing default accountancy product buy code
2020-04-05 03:41:46 +02:00
Laurent Destailleur
25320e5a36
Merge pull request #13494 from ptibogxiv/patch-321
...
NEW display weight in shipment list
2020-04-05 03:20:56 +02:00
Laurent Destailleur
0aee0028c2
Merge pull request #13489 from andreubisquerra/develop
...
Receipt compatibility with receipt printer module
2020-04-05 03:20:14 +02:00
Laurent Destailleur
b6a0432589
Merge pull request #13495 from atm-maxime/new_report_supplier_turnover
...
New report supplier turnover
2020-04-05 03:19:18 +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
Scrutinizer Auto-Fixer
612bac6598
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-05 00:44:59 +00:00
Laurent Destailleur
2f1b25c67a
Fix property not defined
2020-04-05 02:43:30 +02:00
Laurent Destailleur
a8710c2109
Merge pull request #13481 from frederic34/patch-6
...
fix tooltip for list.php
2020-04-05 02:40:10 +02:00
Laurent Destailleur
a41f54c82f
Fix css
2020-04-05 02:39:40 +02:00
Laurent Destailleur
ed0f6b56b9
FIX: The "test smtp connectivity" failed on page to setup mass emailing
2020-04-05 00:29:34 +02:00
Laurent Destailleur
5583ad9c38
Fix
2020-04-04 23:39:44 +02:00
Laurent Destailleur
716e037761
Fix previous login if first login
2020-04-04 23:31:17 +02:00
Maxime Kohlhaas
fd5b2ba391
New supplier turnover by product service report
2020-04-04 23:29:45 +02:00
Laurent Destailleur
a89b873bd1
Look and feel v12
2020-04-04 19:30:16 +02:00
Laurent Destailleur
647d09050b
Clean not required vars
2020-04-04 19:25:36 +02:00
Laurent Destailleur
8454598722
WIP Add tables to manage categories of website pages.
2020-04-04 18:59:26 +02:00
Maxime Kohlhaas
60bd0e49ec
Fix missing token
2020-04-04 18:57:51 +02:00
Laurent Destailleur
9849afd3dd
WIP Add tables to manage categories of website pages.
2020-04-04 18:53:38 +02:00
Maxime Kohlhaas
fe876b96fe
Fix links + getEntity
2020-04-04 18:49:30 +02:00
Maxime Kohlhaas
79e5099c6d
Add menu entries
2020-04-04 18:45:33 +02:00
Laurent Destailleur
9307e3821f
Fix import_key was erased after update
2020-04-04 18:35:40 +02:00
Laurent Destailleur
493a6d9709
Fix trans
2020-04-04 17:46:41 +02:00
Maxime Kohlhaas
1adfe5c21f
New supplier turnover by product service report
2020-04-04 15:45:32 +02:00
Maxime Kohlhaas
863f8dd1d6
New supplier turnover by thirdparty report
2020-04-04 15:38:22 +02:00
Maxime Kohlhaas
67f9b218c5
New supplier turnover report
2020-04-04 15:38:01 +02:00
stickler-ci
a87755390d
Fixing style errors.
2020-04-04 10:48:12 +00:00
ptibogxiv
101fd8e07b
NEW display weight in shipment list
...
usefull to prepare truck before delivery
2020-04-04 12:46:02 +02:00
ptibogxiv
c7cdb64087
FIX child categories only with good entity rights
...
fix v9 to develop
display only categories with good entity rights ( intradolibarr or via REST API)
2020-04-04 11:07:48 +02:00
Laurent Destailleur
221f20e13f
Fix merge
2020-04-03 19:24:16 +02:00
Laurent Destailleur
28a1b7af35
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/modulebuilder/index.php
htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-04-03 18:07:24 +02:00
Laurent Destailleur
e6641b5369
Fix doc
2020-04-03 18:01:54 +02:00
Laurent Destailleur
d46417c8bd
FIX #13482
2020-04-03 17:53:17 +02:00
Laurent Destailleur
372d719693
#13482
2020-04-03 15:48:54 +02:00
Laurent Destailleur
e9bddf5c26
Fix enable/disable of module
2020-04-03 15:36:41 +02:00
Laurent Destailleur
d7e4e5f18c
Fix modulebuilder clone message
2020-04-03 15:14:59 +02:00
Laurent Destailleur
a13287e285
Fix: validate of object is ok even if some fields are missing
2020-04-03 14:56:15 +02:00
Laurent Destailleur
a5a5fe55f6
Code simpler
2020-04-03 14:55:46 +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
f7b6895dc6
Fix option to not generate doc in modulebuilder.
2020-04-03 14:02:37 +02:00
ptibogxiv
99e53f6b18
FIX preg_math
2020-04-03 13:12:00 +02:00
Laurent Destailleur
71910b2181
Fix warning
2020-04-03 13:01:17 +02:00
Laurent Destailleur
4170580d88
Rename const
2020-04-03 12:54:23 +02:00
Laurent Destailleur
7b55deccac
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-03 03:04:39 +02:00
Laurent Destailleur
b5e5d96d50
Doxygen
2020-04-03 03:04:23 +02:00
Laurent Destailleur
c2cdb8be4f
Merge pull request #13486 from ptibogxiv/patch-318
...
NEW better filter on shipment list as other list
2020-04-03 02:52:31 +02:00
Laurent Destailleur
f65e5d19f6
Merge pull request #13485 from joseplluis/develop
...
NEW: add addlinktonotes in members list
2020-04-03 02:50:41 +02:00
Laurent Destailleur
237615aa71
Fix offset for ecuador must be ID of country so 84 + 5 zeros
2020-04-03 02:35:55 +02:00
Laurent Destailleur
b669aca1a0
Merge pull request #13483 from fabianpc/db_ecuador
...
NEW : Chart of accounts to Ecuador
2020-04-03 02:32:30 +02:00
Laurent Destailleur
193a10bc39
FIX cloning of emailing when no content selected
2020-04-03 02:29:10 +02:00
andreubisquerra
27eec2e5db
Travis fix
2020-04-02 23:28:25 +02:00
andreubisquerra
3255c18567
Receipt compatibility with receipt printer module
2020-04-02 22:11:16 +02:00
Laurent Destailleur
98d2db440a
Complete tooltip
2020-04-02 21:34:51 +02:00
Laurent Destailleur
4c8a04cf38
Fix phpcs
2020-04-02 21:17:04 +02:00
ptibogxiv
84f0c216d1
Update list.php
2020-04-02 20:10:57 +02:00
stickler-ci
8b95e8a702
Fixing style errors.
2020-04-02 17:45:28 +00:00
ptibogxiv
67a1c3ea89
NEW better filter on shipment list as other list
2020-04-02 19:43:29 +02:00
Laurent Destailleur
644d83d799
Rename field to avoid confusion
2020-04-02 19:42:08 +02:00
Laurent Destailleur
733814a8a0
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-04-02 18:51:36 +02:00
Laurent Destailleur
7cee643c05
Prepare 10.0.8
2020-04-02 18:51:25 +02:00
Josep Lluís
d2e35fc1f7
NEW: add addlinktonotes in members list
2020-04-02 17:49:01 +02:00
Laurent Destailleur
f3d35b5a19
Fix phpcs
2020-04-02 17:06:57 +02:00
Laurent Destailleur
99ddd25ad5
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-04-02 16:51:50 +02:00
Laurent Destailleur
19084286be
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
ChangeLog
htdocs/fourn/class/fournisseur.product.class.php
2020-04-02 16:49:37 +02:00
Laurent Destailleur
7da01c3013
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-04-02 16:00:20 +02:00
Laurent Destailleur
3408f67348
Clean orhpelins in llx_product_association
2020-04-02 16:00:09 +02:00
Laurent Destailleur
d204cfe6c6
FIX Protection when database has a corrupted product id
2020-04-02 15:54:33 +02:00
Laurent Destailleur
b8c2dd6025
Look and feel v12
2020-04-02 15:11:46 +02:00
Frédéric FRANCE
a55d1fca0a
Update list.php
2020-04-02 14:33:49 +02:00
Laurent Destailleur
386b27a14c
Standardize code
2020-04-02 14:32:54 +02:00
Laurent Destailleur
83fdc5b901
Merge pull request #13429 from TobiasSekan/NewTreeViewForSubCategories
...
NEW Tree view for sub-categories
2020-04-02 13:39:43 +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
e8fa0ec50c
Merge pull request #13467 from Je2fb/develop
...
Update card.php
2020-04-02 13:30:40 +02:00
Laurent Destailleur
123c19086b
Merge pull request #13465 from fabianpc/db_issues
...
Close #13446 Infinite loop of projects without thirdparty...
2020-04-02 13:29:11 +02:00
Laurent Destailleur
3c75c29e6b
Merge pull request #13463 from atm-quentin/FIX_buyprice_filter_was_only_qty
...
FIX : Buyprice was updated only if min price for this qty had same qty
2020-04-02 13:08:40 +02:00
Laurent Destailleur
7ad67ff91d
Merge pull request #13462 from atm-florian/11.0
...
fix advtargetemailing : fatal call to static attribut (table_element is not a static attribut)
2020-04-02 13:05:12 +02:00
Laurent Destailleur
3b6db77cb3
Merge pull request #13460 from atm-quentin/FIX_multicurrency_SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL
...
FIX multicurrency manage on hidden conf SUPPLIER_PROPOSAL_UPDATE_PRIC…
2020-04-02 13:04:00 +02:00
Laurent Destailleur
c6f57c46a8
Update supplier_proposal.class.php
2020-04-02 13:01:49 +02:00
Laurent Destailleur
79b1a2e191
Merge pull request #13457 from oscim/patch-30
...
Update expedition.class.php
2020-04-02 12:57:24 +02:00
Laurent Destailleur
967a6accee
Merge pull request #13461 from oscim/patch-32
...
NEW Add company extrafields into order export
2020-04-02 12:57:05 +02:00
Laurent Destailleur
bec231bd7b
Merge pull request #13459 from oscim/patch-31
...
Update expedition.class.php
2020-04-02 12:55:58 +02:00
Laurent Destailleur
13afd2c199
Merge pull request #13455 from oscim/patch-28
...
Update livraison.class.php
2020-04-02 12:55:27 +02:00
Laurent Destailleur
a2fd363f91
Update livraison.class.php
2020-04-02 12:55:06 +02:00
Laurent Destailleur
276c860910
Merge pull request #13453 from ptibogxiv/patch-317
...
NEW compatibility of translatebel with more dict
2020-04-02 12:53:59 +02:00
Laurent Destailleur
a94f8572f1
Update api_setup.class.php
2020-04-02 12:53:41 +02:00
Laurent Destailleur
ec0fe28da8
Merge pull request #13452 from andreubisquerra/master
...
NEW: Cash Control in TakePOS
2020-04-02 12:51:36 +02:00
Laurent Destailleur
deaae1d1f1
Merge pull request #13469 from cfoellmann/batch-extension
...
change batches max length to 128 characters on sql migration
2020-04-02 12:49:31 +02:00
Laurent Destailleur
c225f35eff
Update 11.0.0-12.0.0.sql
2020-04-02 12:49:20 +02:00
Laurent Destailleur
00a12b9fc8
Merge pull request #13475 from thepocagency/11.0_fix_extrafield_lines_in_template
...
Copy extrafields of lines from a draft invoice to an invoice template
2020-04-02 12:47:34 +02:00
jribal
7380fa32ec
On _checkAccessToResource: category -> categorie
2020-04-02 12:44:50 +02:00
Laurent Destailleur
e79c98baed
Merge pull request #13470 from jribal/patch-1
...
On _checkAccessToResource: category -> categorie
2020-04-02 12:44:26 +02:00
Laurent Destailleur
bb9a4324d1
Merge pull request #13471 from atm-florianm/NEW_add_author_column_on_invoice_list_and_supplier_invoice_list
...
NEW: "author" column in the client/supplier invoice lists
2020-04-02 12:40:51 +02:00
Laurent Destailleur
a7656793da
Merge pull request #13479 from altatof/md
...
FIX md stylesheet to be included by external modules like eldy
2020-04-02 12:40:10 +02:00
Laurent Destailleur
5d9d62f185
Merge pull request #13480 from atm-florian/develop
...
fix: correct hook init invoice_rec list
2020-04-02 12:38:32 +02:00
Laurent Destailleur
9f55918cb8
Remove Geoipv1 library. We use now v2
2020-04-02 12:37:21 +02:00
Laurent Destailleur
b8eaf8dd03
Removed jflot js library (we now use ChartJS)
2020-04-02 12:29:15 +02:00
Laurent Destailleur
84cda962c1
Clean dead code
2020-04-02 12:03:29 +02:00
florian HENRY
10391a5769
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2020-04-02 10:45:46 +02:00
florian HENRY
609de965b1
fix: hook init invoicerec list normalyse
2020-04-02 10:45:14 +02:00
altairis
a743110f03
FIX md stylesheet to be included by external modules like eldy
2020-04-02 10:44:24 +02:00
Florian Mortgat
4d2b4583d0
FIX - This error logs an Orderline::delete error, but this is an Orderline::insert error
2020-04-02 09:28:56 +02:00
stickler-ci
9476fbc3e7
Fixing style errors.
2020-04-01 23:16:13 +00:00
Alex Veremme
7330c31204
Fix ##13474: copy extrafields of LINES from a draft invoice to an
...
invoice template
2020-04-02 01:10:56 +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
184d50171d
Update example for clamav - prefer clamav daemon
2020-04-01 22:01:05 +02:00
Laurent Destailleur
70706d9ea7
FIX Missing token and take into account max date when it can.
2020-04-01 18:48:45 +02:00
Laurent Destailleur
d2de6a22eb
WIP Can set values in extra languages
2020-04-01 18:11:28 +02:00
Florian Mortgat
f52af23396
NEW: "author" column in the client/supplier invoice lists
2020-04-01 17:09:01 +02:00
Laurent Destailleur
4727800206
Can show technical ID of any object in banner.
2020-04-01 16:51:45 +02:00
Laurent Destailleur
33d2b61c19
Work on extralanguages
2020-04-01 16:21:03 +02:00
ATM john
81adc6913e
change conf usage
2020-04-01 12:12:30 +02:00
jribal
cae0f210a2
On _checkAccessToResource: category -> categorie
2020-04-01 11:09:40 +01:00
Christian Foellmann
6aa65f1a02
change batches max length to 128 characters on sql migration
2020-04-01 09:57:51 +02:00
ptibogxiv
a0c2bc3743
Update api_setup.class.php
2020-03-31 20:52:15 +02:00
Je2fb
fa32618fe9
Update card.php
...
If rate change is modify, the currency price is taken in place of the price from the main currency
2020-03-31 18:58:59 +02:00
Laurent Destailleur
6f0071bebe
FIX sort on company on member list
2020-03-31 17:54:48 +02:00
Laurent Destailleur
b407797ca3
Fix css
2020-03-31 17:45:45 +02:00
Fabian Palacios
ae4fb855d7
chart of accounts to Ecuador
2020-03-31 10:10:22 -05:00
Fabian Palacios
db18226493
Chart of accounts to Ecuador
2020-03-31 10:08:37 -05:00
ATM john
79fe664365
fix merge not applied
2020-03-31 16:43:38 +02:00
stickler-ci
004d9381f5
Fixing style errors.
2020-03-31 14:36:42 +00:00
ATM john
fdffbf42f9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-03-31 16:33:47 +02:00
ATM john
035bb671f2
Fix sql ; missing
2020-03-31 16:32:07 +02:00
Fabian Palacios
3797080ab5
#13446 fix loop for dislplay of OthersNotLinkedToThirdParty
2020-03-31 09:29:59 -05:00
ATM john
c466beea3d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-03-31 16:28:43 +02:00
Laurent Destailleur
766f480741
css
2020-03-31 16:24:33 +02:00
stickler-ci
1f5da36fdb
Fixing style errors.
2020-03-31 13:02:44 +00:00
atm-quentin
e3dfe60567
uniformize update buyprice + some fixes
2020-03-31 14:53:15 +02:00
Laurent Destailleur
f09321a497
css
2020-03-31 13:57:19 +02:00
Laurent Destailleur
e75e49426f
Look and feel v12
2020-03-31 13:52:02 +02:00
Laurent Destailleur
0b486ea5ad
CSS
2020-03-31 13:28:19 +02:00
florian HENRY
5658d783d6
fix advtargetemailing : fatal call to static attribut (that is not static: table_element)
2020-03-31 12:04:34 +02:00
oscim
3b8a16e3fd
Update modCommande.class.php
...
add extrafileds company in export orders
2020-03-31 11:05:21 +02:00
stickler-ci
5a62da101d
Fixing style errors.
2020-03-31 09:04:46 +00:00
atm-quentin
73f6c9210f
FIX multicurrency manage on hidden conf SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL
2020-03-31 11:03:08 +02:00
oscim
f66c90ca8b
Update expedition.class.php
...
report usage multicurrency of thirdparty in fetch method expedition for use in other process
2020-03-31 10:57:52 +02:00
stickler-ci
24c5f57da2
Fixing style errors.
2020-03-31 08:56:26 +00:00
oscim
5895858546
Update expedition.class.php
...
report fk_unit line in fetch_line methode
2020-03-31 10:54:14 +02:00
stickler-ci
fb80199713
Fixing style errors.
2020-03-31 07:23:36 +00:00
oscim
3a95beac66
Update livraison.class.php
...
add in fetch_lines method item for determine weight and dimension , and unit for all lines
2020-03-31 09:20:48 +02:00
Laurent Destailleur
0b1cfcc0cc
Fix phpcs
2020-03-31 00:13:27 +02:00
Laurent Destailleur
353d561060
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-31 00:11:46 +02:00
Laurent Destailleur
416d1ce3f0
Fix phpcs
2020-03-31 00:11:31 +02:00
stickler-ci
7409642636
Fixing style errors.
2020-03-30 19:12:29 +00:00
ptibogxiv
fbf7375fe5
NEW compatibility of translabel with more dict
2020-03-30 21:10:27 +02:00
jove@bisquerra.com
d9614ac6fc
Integrate Cash Control in TakePOS
2020-03-30 20:05:45 +02:00
Laurent Destailleur
2e1fe7b989
Merge pull request #13451 from andreubisquerra/develop
...
Log CUPS print error on Receipt Printer module
2020-03-30 20:02:56 +02:00
Laurent Destailleur
5f8d9fc8e8
Merge pull request #13347 from bafbes/abb60311
...
NEW:Show units of products in stocks and hide total units if content is of diffents units
2020-03-30 20:01:59 +02:00
Laurent Destailleur
774137b937
Update card.php
2020-03-30 20:00:59 +02:00
Laurent Destailleur
401265d09e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-30 19:56:59 +02:00
Laurent Destailleur
3860f24908
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/product/class/product.class.php
2020-03-30 19:56:31 +02:00
Laurent Destailleur
d0c179e1e9
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-03-30 19:54:32 +02:00
Laurent Destailleur
878c4fb106
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2020-03-30 19:53:40 +02:00
Laurent Destailleur
fbce8fcfe3
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/product/class/product.class.php
2020-03-30 19:53:31 +02:00
Laurent Destailleur
125e964352
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/product/class/product.class.php
2020-03-30 19:50:47 +02:00
Laurent Destailleur
b081cf5cba
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/product/class/product.class.php
2020-03-30 19:48:41 +02:00
Laurent Destailleur
3ea9c297ea
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2020-03-30 19:46:23 +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
6ecacb9c29
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-03-30 19:38:07 +02:00
Laurent Destailleur
07d64f47e3
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-03-30 19:37:29 +02:00
Laurent Destailleur
7466eaade3
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-03-30 19:37:01 +02:00
Laurent Destailleur
9fcbec9f02
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-03-30 19:36:07 +02:00
andreubisquerra
493e07a14e
Log CUPS print error on Receipt Printer module
...
Important help to debug errors on CUPS printing
2020-03-30 19:32:23 +02:00
Laurent Destailleur
da642823b9
Merge pull request #13445 from cfoellmann/fix-task-creation
...
Fix function to create a task
2020-03-30 19:31:19 +02:00
Laurent Destailleur
7c9583011a
Merge pull request #13441 from hgy29/patch-1
...
FIX: extra date field incorrect check
2020-03-30 19:30:25 +02:00
Laurent Destailleur
d2bfc5f6dc
Merge pull request #13437 from pstructures/develop
...
Add the ability to add tabs from module for company admin setup
2020-03-30 19:25:37 +02:00
Laurent Destailleur
06277ec6e0
Update company.lib.php
2020-03-30 19:24:00 +02:00
Laurent Destailleur
95de8d1992
Update admin.lib.php
2020-03-30 19:23:25 +02:00
Laurent Destailleur
3a33b92151
Merge pull request #13436 from andreubisquerra/develop
...
TakePOS CSS fix in action buttons
2020-03-30 19:20:57 +02:00
Laurent Destailleur
1c7ce31207
Merge pull request #13435 from ptibogxiv/patch-316
...
FIX product get purchase prices
2020-03-30 19:20:32 +02:00
Laurent Destailleur
89cbaa3391
Merge pull request #13440 from atm-maxime/new_bom_cost
...
New bom cost
2020-03-30 19:16:09 +02:00
Laurent Destailleur
0ec35793ee
Merge pull request #13433 from ptibogxiv/patch-315
...
NEW filter by product on supplier order API
2020-03-30 19:12:29 +02:00
Laurent Destailleur
81b41c932f
Merge pull request #13432 from atm-quentin/FIX_reapro_11
...
FIX replenish stock to buy
2020-03-30 19:11:34 +02:00
Laurent Destailleur
593a78dda7
Merge pull request #13426 from TobiasSekan/FixSupplierProposalMulticurrency
...
FIX not working add/change supplier proposal line with multi-currency value
2020-03-30 19:00:08 +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
Laurent Destailleur
45a237e31b
Merge pull request #13421 from atm-quentin/NEW_hook_product_load_stats
...
NEW hook on product load stats
2020-03-30 18:54:31 +02:00
Laurent Destailleur
ff549cad18
Merge pull request #13417 from FHenry/dev_tasklist_columnAndExtrafields
...
NEW : Project task list, add column selector and extrafields
2020-03-30 18:53:42 +02:00
Laurent Destailleur
04a5929e91
Merge pull request #13431 from aspangaro/12.0_a25
...
Typo
2020-03-30 18:52:10 +02:00
Laurent Destailleur
d8fb629457
Merge pull request #13450 from oscim/patch-27
...
Fix use correctly hosts in connection
2020-03-30 18:51:52 +02:00
Laurent Destailleur
be3cc164c6
Increase size for unalterable logs record.
2020-03-30 18:41:21 +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
Laurent Destailleur
398812afa5
Add field to store version of encoding of line in blockedlog
2020-03-30 17:47:29 +02:00
Laurent Destailleur
39fba83f26
Add a right navigation on list of stripe charges
2020-03-30 15:56:14 +02:00
Laurent Destailleur
a886629d08
Fix lang
2020-03-30 15:00:29 +02:00
Laurent Destailleur
2b725ad5d5
Update year in demo data
2020-03-30 14:57:56 +02:00
atm-quentin
9a92545d8d
FIX missing default accountancy product buy code
2020-03-30 14:28:22 +02:00
atm-quentin
64207ef58d
FIX missing array option
2020-03-30 14:18:59 +02:00
Cédric
eead9a93d3
Fix can set desiredstock to (int) 0 from API Rest
...
When you set desiredstock to 0 as an integer from the API, it registers to null in the database. Using is_numeric() fixes this.
2020-03-30 13:03:13 +02:00
Christian Foellmann
e27500ce64
Fix function to create a task
2020-03-30 12:24:21 +02:00
Francis Appels
3eda785ca5
Add newline end of file
2020-03-30 10:36:49 +02:00
Maxime Kohlhaas
83b5b82147
Merge branch 'new_bom_cost' of github.com:atm-maxime/dolibarr into new_bom_cost
2020-03-30 10:34:23 +02:00
Maxime Kohlhaas
8e4e1002f9
Missing return comment
2020-03-30 10:33:48 +02:00
Francis Appels
076caa11ab
Add token functions to improve modulebuilder compatiblity with maintained versions.
2020-03-30 10:28:20 +02:00
stickler-ci
3a349e6533
Fixing style errors.
2020-03-30 08:25:57 +00: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
Maxime Kohlhaas
b0e7bd8a30
Finish BOM cost calculation
2020-03-30 10:20:56 +02:00
Maxime Kohlhaas
436fcd39d4
Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_bom_cost
2020-03-30 10:20:45 +02:00
Laurent Destailleur
5b5f4a900c
Fix css of buttome of recommended choice
2020-03-29 23:14:51 +02:00
Laurent Destailleur
e9fbcb45cf
Fix trans
2020-03-29 21:24:05 +02:00
Laurent Destailleur
5fad4c8cb4
CSS
2020-03-29 19:41:01 +02:00
Laurent Destailleur
4ed4644c08
Work on generic multilanguage properties
2020-03-29 04:28:23 +02:00
Laurent Destailleur
239732a234
trans
2020-03-29 03:36:34 +02:00
Laurent Destailleur
44f7ba65e4
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-29 03:34:23 +02:00
Laurent Destailleur
78bcf280ac
CSS
2020-03-29 03:31:49 +02:00
Laurent Destailleur
9b2da5bdae
FIX Missing token
2020-03-29 00:56:11 +01:00
Laurent Destailleur
cc35b5e6bd
css
2020-03-28 17:49:20 +01:00
Maxime Kohlhaas
0512b3a7a7
Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_bom_cost
2020-03-28 16:37:39 +01: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
Matt Sidnell
6f07b87cde
Update admin.lib.php
2020-03-27 23:22:02 +00:00
Matt Sidnell
f93bdf6b22
Fix so company_admin tabs do not show in Societe
...
fix
2020-03-27 23:09:40 +00:00
andreubisquerra
0db7c2bf21
TakePOS CSS fix in action buttons
2020-03-27 23:19:56 +01:00
Matt Sidnell
815ae3cb09
Ability to add new tabs on company admin section
...
I have added the option to add a tab from a module to the main company setup section. I need this ability so thought that others might too.
2020-03-27 21:51:34 +00:00
ptibogxiv
cb7342d4c8
FIX product purchase prices
...
Fix get datas but don't fix cleandata :( @eldy
2020-03-27 20:07:18 +01:00
Laurent Destailleur
235210b3bc
Look and feel v12
2020-03-27 19:26:45 +01:00
Laurent Destailleur
4207d94f53
FIX Bad position of total in column
...
Conflicts:
htdocs/fourn/facture/paiement.php
2020-03-27 19:10:01 +01:00
Laurent Destailleur
a4797634d5
FIX Bad position of total in column
2020-03-27 19:08:39 +01:00
Laurent Destailleur
b33552fb6f
Fix phpcs
2020-03-27 16:13:53 +01:00
Laurent Destailleur
c27592bad2
Clean deprecated params on all fetch_optionals()
2020-03-27 16:02:58 +01:00
ptibogxiv
497b0e4ecc
NEW filter by product on supplier order
...
let's get the next replenishment date and order's informations on front-end for selected products
2020-03-27 15:30:05 +01:00
Laurent Destailleur
f512e0d161
Fix popup
2020-03-27 12:06:58 +01:00
Laurent Destailleur
975f061b43
Fix popup
2020-03-27 12:06:18 +01:00
Laurent Destailleur
3a9cc532d7
FIX Use getNomURL instead of hard coded link. Fix limit.
2020-03-27 11:56:59 +01:00
Laurent Destailleur
259f23e96b
Look and feel v11
2020-03-27 11:56:45 +01:00
Laurent Destailleur
4f83eb59cd
FIX Use getNomURL instead of hard coded link. Fix limit.
2020-03-27 11:55:33 +01:00
Laurent Destailleur
fd3d13cfcf
Look and feel v11
2020-03-27 11:15:38 +01:00
atm-quentin
96481c3d52
FIX ordered stock already in $stock
2020-03-27 09:43:59 +01:00
Alexandre SPANGARO
e1611a8366
Typo
2020-03-27 06:16:24 +01:00
Laurent Destailleur
354cb8c1b0
Work on Kanban view for modules
2020-03-27 01:59:17 +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
Bahfir Abbes
f7ecc9d60c
Fix:The column "print $langs->trans("StockCorrection");" is now duplicated.
2020-03-26 15:22:24 +01:00
stickler-ci
2bf054364d
Fixing style errors.
2020-03-26 11:48:45 +00:00
Tobias Sekan
7d72fc70c7
New tree-view for sub-categories
2020-03-26 11:36:53 +00:00
stickler-ci
38029abcb1
Fixing style errors.
2020-03-26 08:34:27 +00:00
Tobias Sekan
1e13dbe270
fix non numeric error
2020-03-26 09:29:35 +01:00
Tobias Sekan
4624fd2445
Fix add mulitcurrency line in supplier proposal
2020-03-26 09:23:19 +01:00
atm-quentin
cef65a3c8f
FIX hook name and useless inithook
2020-03-26 09:20:14 +01:00
Tobias Sekan
f7762f11db
Fix change multicurrency line in supplier proposal
2020-03-26 09:13:56 +01:00
stickler-ci
208049a8f2
Fixing style errors.
2020-03-26 07:27:10 +00:00
florian HENRY
aded72a6fa
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_tasklist_columnAndExtrafields
2020-03-26 08:24:39 +01:00
florian HENRY
21b98a7c4c
set as global
2020-03-26 08:24:20 +01:00
Laurent Destailleur
c9696114f4
Fix scrutinizer
2020-03-26 04:30:16 +01:00
Laurent Destailleur
5a5863f46a
FIX Group by invalid with pgsql
2020-03-26 03:55:34 +01:00
Laurent Destailleur
fb5363d857
Fix pregex
2020-03-26 03:32:05 +01:00
Laurent Destailleur
004397304e
FIX Foreign currency lost when splitting a discount
2020-03-26 02:32:53 +01:00
Laurent Destailleur
f0de10897a
FIX Foreign currency lost when splitting a discount
2020-03-26 02:32:24 +01:00
Laurent Destailleur
3ae3e9a16e
Remove $_POST
2020-03-26 02:21:50 +01:00
Laurent Destailleur
d3debccabe
FIX bad value in currency into discount created from down payment
2020-03-26 02:14:57 +01:00
Laurent Destailleur
d2163c95d6
Save the vat src code when converting down payment into discount
2020-03-26 02:13: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
88d98acbba
FIX #13410
...
Conflicts:
htdocs/compta/facture/card.php
2020-03-26 01:26:50 +01:00
Laurent Destailleur
a05f9fad33
FIX Look and feel v11
2020-03-26 01:25:10 +01:00
Laurent Destailleur
ab19bb2455
FIX default value of selectMasssAction broken
2020-03-26 01:25:05 +01:00
Laurent Destailleur
ba000dbcfd
FIX #13410
2020-03-26 01:24:27 +01:00
Laurent Destailleur
82825f143b
FIX Look and feel v11
2020-03-26 01:24: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
Laurent Destailleur
2e5bfb207f
Fix responsive
2020-03-25 23:50:05 +01:00
andreubisquerra
d420656c3f
Update langs
2020-03-25 21:32:58 +01:00
andreubisquerra
eef3a1795e
Update dolreceiptprinter.class.php with CUPS
2020-03-25 21:30:33 +01:00
andreubisquerra
3e4b788316
Update receiptprinter.php with CUPS
2020-03-25 21:23:55 +01:00
Laurent Destailleur
e937b22721
Increase batch number to 128
2020-03-25 19:34:52 +01:00
Laurent Destailleur
04f0cdac18
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-25 19:30:06 +01:00
Laurent Destailleur
4e77413996
Try fix suggested in #13418
2020-03-25 19:29:54 +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
8820fa6ca5
Merge pull request #13420 from TobiasSekan/NewAddCategoryFromSubCat
...
NEW show "New category" button in top of sub categories list
2020-03-25 18:48:43 +01:00
Laurent Destailleur
b48c21dbcb
If we need more var here, we must fix to have var starting with search_
2020-03-25 18:47:42 +01:00
Laurent Destailleur
e160ea2bee
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-03-25 18:45:55 +01:00
Laurent Destailleur
33fe7b5f70
Merge pull request #13416 from simnandez/11.0
...
FIX: Compatibility with multicompany, bad numerotation of task.
2020-03-25 18:40:13 +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
9d25a0f83f
Merge pull request #13411 from andreubisquerra/develop
...
No reload page to load other sale in TakePOS
2020-03-25 18:29:35 +01:00
Laurent Destailleur
925554d15e
More accurate result
2020-03-25 18:27:53 +01:00
Laurent Destailleur
6f1b9c4678
Fix colspan
2020-03-25 18:24:39 +01:00
Laurent Destailleur
3855ef6073
Add rounding code 'CR' (currency rate'
2020-03-25 17:41:39 +01:00
Laurent Destailleur
63e0e1f4bf
Fix option THEME_TOPMENU_DISABLE_IMAGE
2020-03-25 17:35:50 +01:00
Laurent Destailleur
1c01972bfe
Fix logs
2020-03-25 17:30:54 +01:00
Laurent Destailleur
3c572c1909
Debug multicurrency
2020-03-25 17:24:20 +01:00
Laurent Destailleur
f509c6a266
Add user id into ajaxconst_onoff
2020-03-25 16:00:42 +01:00
Laurent Destailleur
c06655bc03
Fix regression of bookmarks for blind people
2020-03-25 15:40:02 +01:00
florian HENRY
81d86f717d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_tasklist_columnAndExtrafields
2020-03-25 12:14:54 +01:00
florian HENRY
8662c864d2
remove not use column from arrayfields
2020-03-25 12:14:42 +01:00
VESSILLER
c516a54f78
FIX get remain to pay with rounding decimals
2020-03-25 11:53:47 +01:00
Laurent Destailleur
59f66ce9bd
Type of var
2020-03-25 11:32:24 +01:00
atm-quentin
e9ee78ab8f
NEW hook on product load stats
2020-03-25 11:20:54 +01:00
Tobias Sekan
c38e16460e
Add new category button in sub categories
2020-03-25 10:31:40 +01:00
gauthier
81af385259
FIX : when we filter a list on a view status, we want this filter to be on bookmark that we create
2020-03-25 10:27:59 +01:00
Alexandre SPANGARO
c3e5cf901d
Work on split module fournisseur
2020-03-24 22:20:25 +01:00
Alexandre SPANGARO
5528e9ef38
Work on split module fournisseur
2020-03-24 22:02:58 +01:00
Laurent Destailleur
d1c6079a7a
Fix phpcs
2020-03-24 21:44:47 +01:00
Laurent Destailleur
92db075aa1
Add parameter morecss to img_credit_card()
2020-03-24 21:40:25 +01:00
Alexandre SPANGARO
e6d9f7885c
Work on split module fournisseur
2020-03-24 21:22:20 +01:00
Laurent Destailleur
86fc2c5d26
Standardize color of status
2020-03-24 20:18:18 +01:00
florian HENRY
6e4038a051
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_tasklist_columnAndExtrafields
2020-03-24 19:50:19 +01:00
florian HENRY
46a4184f15
NEW : Project task list, add column selector and extrafields
2020-03-24 19:50:01 +01:00
Laurent Destailleur
62fefab5ac
Standardize color of status
2020-03-24 19:06:37 +01:00
Juanjo Menent
fec3377f24
FIX: Compatibility with multicompany, bad numerotation of task.
2020-03-24 18:49:16 +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
gauthier
4c0de74470
FIX : sort by default role makes no sense
2020-03-24 16:27:53 +01:00
florian HENRY
21febcc8fc
fix extrafeild creation
2020-03-24 16:09:18 +01:00
Laurent Destailleur
1657a6b50a
FIX actions on supplier proposal not saved (bad trigger name)
...
Conflicts:
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-03-24 15:00:13 +01:00
Laurent Destailleur
d922eb270d
FIX actions on supplier proposal not saved (bad trigger name)
2020-03-24 13:25:45 +01:00
Laurent Destailleur
a5379c7144
FIX All forms must use newToken()
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/cashcontrol/cashcontrol_card.php
htdocs/supplier_proposal/card.php
2020-03-24 13:14:23 +01:00
Laurent Destailleur
1ff15e1fd9
FIX All forms must use newToken()
2020-03-24 13:10:35 +01:00
Laurent Destailleur
2b33ef7e46
Align color of graph of status on status color
2020-03-24 13:06:59 +01:00
Maxime Kohlhaas
bcbccf0c83
Start working on bom cost
2020-03-24 10:32:31 +01:00
andreubisquerra
58a10c9c16
Unnecessary line
2020-03-23 23:10:55 +01:00
andreubisquerra
585c46b181
Avoid print customer name when is default
2020-03-23 22:58:04 +01:00
andreubisquerra
53850caa87
No reload page to load other sale in TakePOS
2020-03-23 22:44:26 +01:00
Laurent Destailleur
f56de9f177
Fix autocalculation of timespent in monthy mode
2020-03-23 22:04:40 +01:00
Laurent Destailleur
063cf15bcb
Clean code
2020-03-23 20:16:51 +01:00
Laurent Destailleur
f4a52470e3
Graph use color of status
2020-03-23 19:46:43 +01:00
Laurent Destailleur
c2f0cdc0f6
Look and feel v12. Several minor fixes
2020-03-23 19:35:14 +01:00
Laurent Destailleur
820a21a721
Simple setup tutorial
2020-03-23 18:35:22 +01:00
Laurent Destailleur
16ddc56353
FIX #12277
2020-03-23 17:47:30 +01:00
Laurent Destailleur
8f07fc0550
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-23 17:39:46 +01:00
Laurent Destailleur
b9088c1ce3
css
2020-03-23 17:39:35 +01:00
Laurent Destailleur
c249a1af14
Merge pull request #13408 from Dolibarr/scrutinizer-patch-3
...
Scrutinizer Auto-Fixes
2020-03-23 17:39:09 +01:00
Laurent Destailleur
2a310b09af
Fix phpcs
2020-03-23 17:24:47 +01:00
Laurent Destailleur
b18d3e5588
Fix var not defined
2020-03-23 15:58:47 +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
0905b3a6b2
Fix function not found
2020-03-23 15:46:16 +01:00
Laurent Destailleur
716777f364
Fix scrutinizer errors
2020-03-23 15:43:41 +01:00
Laurent Destailleur
01e60562b9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/index.php
htdocs/takepos/takepos.php
2020-03-23 15:38:10 +01:00
Laurent Destailleur
db6cb2d449
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-23 15:34:03 +01:00
Laurent Destailleur
24dc202022
Doc
2020-03-23 15:33:52 +01:00
Laurent Destailleur
1e955a89ef
FIX #13399 after #13285 and #13183
2020-03-23 15:28:18 +01:00
Laurent Destailleur
0dbc37667c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-03-23 15:25:42 +01:00
Laurent Destailleur
ca4b641094
FIX #13407
2020-03-23 15:24:29 +01:00
Laurent Destailleur
e4a9763f54
Merge pull request #13405 from aspangaro/12.0_a25
...
Qual: Move supplier proposal menu to the core
2020-03-23 15:17:10 +01:00
Laurent Destailleur
aab3ca4fa1
Merge pull request #13402 from andreubisquerra/develop
...
Fix TakePOS DirectPayment when place is higher 0
2020-03-23 15:12:38 +01:00
Laurent Destailleur
d662bb97dc
Debug parallel sale feature
2020-03-23 15:02:15 +01:00
Laurent Destailleur
d965aad6e6
Some fix to support correctly parallel sales
2020-03-23 14:31:59 +01:00
Laurent Destailleur
2177afecd9
Sort order
2020-03-23 14:12:48 +01:00
Alexandre SPANGARO
89de39f199
Move supplier proposal menu to the core
2020-03-23 08:51:38 +01:00
Regis Houssin
45579b0986
FIX remove unused var, $usercancreate can be change by Multicompany
2020-03-23 07:01:23 +01:00
Alexandre SPANGARO
d5729e6dcc
Work on split module fournisseur
2020-03-23 05:53:33 +01:00
Alexandre SPANGARO
7d22ccbd12
Merge remote-tracking branch 'upstream/develop' into 12.0_a23
2020-03-23 05:50:07 +01:00
Alexandre SPANGARO
e6a59dcdbb
Work on split module fournisseur
2020-03-23 05:43:41 +01:00
andreubisquerra
fbe6711353
Fix TakePOS DirectPayment when place is higher 0
2020-03-22 22:46:40 +01:00
andreubisquerra
618da0a808
Fix TakePOS DirectPayment when place is higher 0
2020-03-22 22:39:41 +01: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
ef86311639
Merge pull request #13224 from mapiolca/patch-38
...
# Fix Compatibility with NOTMODIFYOTHERENTITYFOURNPRICE const.
2020-03-22 20:32:15 +01:00
Laurent Destailleur
f20e0efe06
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-22 20:22:41 +01:00
Laurent Destailleur
c80c247a84
Fix phpcs
2020-03-22 20:22:33 +01:00
Laurent Destailleur
3eaed6bfc8
Fix phpcs
2020-03-22 20:22:08 +01:00
Laurent Destailleur
4b3d2bfb64
Merge pull request #13398 from andreubisquerra/master
...
NEW: Multiple sales in TakePOS
2020-03-22 20:19:40 +01:00
Laurent Destailleur
1cb598290a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-22 20:17:10 +01:00
Laurent Destailleur
1fdef022f0
css
2020-03-22 20:16:14 +01:00
Laurent Destailleur
cafe898b6a
Merge pull request #13392 from andreubisquerra/develop
...
Remove vars to avoid conficts in TakePOS setup
2020-03-22 19:49:38 +01:00
Laurent Destailleur
226f4695cd
Fix migration of type of field
2020-03-22 19:48:53 +01:00
Laurent Destailleur
8313ed9ee4
Merge pull request #13388 from OPEN-DSI/new-type-category-from-hook
...
NEW add category type from hook
2020-03-22 19:45:31 +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
b0f3fba71a
Fix phpcs
2020-03-22 18:27:56 +01:00
Laurent Destailleur
5df690f9bb
Fix phpcs
2020-03-22 17:29:15 +01:00
Laurent Destailleur
3d6849dfea
Fix label of tabs
2020-03-22 17:27:08 +01:00
Laurent Destailleur
ce47351b76
Trans
2020-03-22 17:11:58 +01:00
Laurent Destailleur
7145754376
Can set different warehous, lot during production
2020-03-22 17:06:59 +01:00
andreubisquerra
40e5e7a46b
Travis fixes
2020-03-22 15:24:32 +01:00
jove@bisquerra.com
a2b973f9f7
NEW: Multiple sales in TakePOS
2020-03-22 14:50:09 +01:00
Laurent Destailleur
425d2afc4b
Rename js into js.php. Fix some labels
2020-03-22 12:31:27 +01:00
Laurent Destailleur
23e06debb7
Popup is smaller
2020-03-22 11:52:02 +01:00
Laurent Destailleur
9f583226f9
FIX var $ismutientitymanaged must be public not protected
2020-03-22 11:45:40 +01:00
Alexandre SPANGARO
b613769606
Work on split module fournisseur
2020-03-22 06:09:47 +01:00
Alexandre SPANGARO
c05ef16e0b
Work on split module fournisseur
2020-03-22 05:51:14 +01:00
Alexandre SPANGARO
6e9a07d119
Work on split module fournisseur
2020-03-22 05:33:30 +01:00
Laurent Destailleur
bcf17c79ef
FIX closing tags
2020-03-22 02:44:00 +01:00
Laurent Destailleur
a0dfbaaea8
Fix: Clean header an non https redirect to avoid to have cookie session
...
ID in non https answers.
2020-03-22 02:16:33 +01:00
Laurent Destailleur
ba8ece525d
NEW If $dolibarr_main_force_https is set, the flag 'secure' on session
...
cookie is also set.
2020-03-22 01:59:32 +01:00
Laurent Destailleur
c8b05036a4
Prepare notif using the notif table
2020-03-22 01:24:50 +01:00
Laurent Destailleur
e2acb0c65e
code indent
2020-03-21 19:37:09 +01:00
Laurent Destailleur
792b9228d3
Can search in several different type of containers
2020-03-21 19:09:14 +01:00
Laurent Destailleur
83b8497d28
Rename sample file so we can use color editor
2020-03-21 17:58:03 +01:00
Laurent Destailleur
4ce1665a15
Fix charset in RSS export
2020-03-21 17:36:07 +01:00
Laurent Destailleur
79086011f8
Work on RSS export of blog posts
2020-03-21 17:31:44 +01:00
Laurent Destailleur
666b38b44a
Fix charset in RSS export
2020-03-21 17:31:09 +01:00
andreubisquerra
4b7de1e5f5
Remove vars to avoid conficts in TakePOS setup
2020-03-21 15:48:25 +01:00
Laurent Destailleur
7370268b13
Tool to regenerate files
2020-03-21 11:04:33 +01:00
Laurent Destailleur
39af3635c5
Responsive
2020-03-20 21:50:34 +01:00
Laurent Destailleur
ade07865d6
FIX Look and feel v11
2020-03-20 21:21:40 +01:00
Laurent Destailleur
3e807b00ba
FIX Look and feel v11
2020-03-20 21:21:30 +01:00
Laurent Destailleur
640ee5277c
FIX Look and feel v11
2020-03-20 21:19:43 +01:00
Laurent Destailleur
588692760a
FIX Look and feel v11
2020-03-20 21:16:52 +01:00
Laurent Destailleur
599bf89f60
Fix can edit emailing after sending has started
2020-03-20 20:46:21 +01:00
Laurent Destailleur
5d9e713a1c
Fix better default sort order
2020-03-20 20:36:59 +01:00
Laurent Destailleur
68cadb58bb
Fix better default sort order
2020-03-20 20:36:26 +01:00
Laurent Destailleur
27015fc6f6
NEW Add method to add social network sharing buttons on blog posts
2020-03-20 19:34:49 +01:00
Bahfir Abbes
c9bdefbbe0
fix: delete redundant test+fix condition test+display units type if products in warehouse of same nature
2020-03-20 19:08:24 +01:00
Laurent Destailleur
a2f9f72973
Enhance website module
2020-03-20 18:58:45 +01:00
Laurent Destailleur
f904ff5240
Add dol_escape_json method
2020-03-20 17:10:35 +01:00
Laurent Destailleur
aa1f601528
FIX Backto link
2020-03-20 16:30:45 +01:00
Laurent Destailleur
d28eaf5824
FIX Backto link
2020-03-20 15:48:50 +01:00
Laurent Destailleur
43763771a6
FIX Backto link
2020-03-20 15:47:50 +01:00
VESSILLER
ac5d2fedc5
NEW add category type from hook
2020-03-20 15:40:46 +01:00
Laurent Destailleur
4e007fe94c
Import jommla news
2020-03-20 15:12:50 +01:00
Laurent Destailleur
e61222504a
Look and feel
2020-03-20 11:49:00 +01:00
Laurent Destailleur
e0fd80af1f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-20 10:51:47 +01:00
Laurent Destailleur
5f0f376817
Merge pull request #13334 from OPEN-DSI/new-takepos-group-same-product
...
NEW add a parameter to group same product
2020-03-20 10:45:06 +01:00
Laurent Destailleur
a0086d73a1
Merge pull request #13371 from aspangaro/12.0_a23
...
Work on split module fournisseur
2020-03-20 10:37:54 +01:00
Laurent Destailleur
aae0be492f
Dolibarr logo in puce css <span class="fa fa-dolibarr-css"></span>
2020-03-20 10:28:47 +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
222556b464
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/accounting-files.php
htdocs/core/lib/functions.lib.php
2020-03-19 22:09:17 +01:00
Laurent Destailleur
87e808fec4
Fix phpcs
2020-03-19 22:07:20 +01:00
Laurent Destailleur
a413e2861e
Fix edit html
2020-03-19 21:13:15 +01:00
Laurent Destailleur
03b261d54c
Provide information of thirdparty, contact or project to SMS handler
2020-03-19 19:11:34 +01:00
Laurent Destailleur
d9f616d6e3
Avoid file xxx_preview-1.png into export
2020-03-19 15:59:49 +01:00
Laurent Destailleur
c71da5d013
FIX mass action on stock movements
2020-03-19 15:43:06 +01:00
Laurent Destailleur
303961b0a6
Fix trans
2020-03-19 12:10:22 +01:00
Laurent Destailleur
7eb4522636
FIX missing token and save of survey description
2020-03-19 11:59:57 +01:00
Alexandre SPANGARO
a6227aeb6a
FIX: Load the translation file for extrafields
2020-03-19 11:53:42 +01:00
Alexandre SPANGARO
bac099dc60
Merge remote-tracking branch 'upstream/develop' into 12.0_a23
2020-03-19 11:48:21 +01:00
Laurent Destailleur
8e1ffa5144
Fix management of token
2020-03-19 10:52:07 +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
56d6c4691f
FIX #13382 Note will be concat to private note
2020-03-18 21:06:36 +01:00
Laurent Destailleur
25b62646b6
Fix we must supplier codes
2020-03-18 20:26:28 +01:00
Laurent Destailleur
009746ab79
Invert seller and buyer
2020-03-18 19:59:18 +01:00
Laurent Destailleur
6c3b6c7a54
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-18 19:56:02 +01:00
Laurent Destailleur
6298071f83
CSS
2020-03-18 19:55:49 +01:00
Laurent Destailleur
6b3826cbb8
Merge branch 'develop' into patch-25
2020-03-18 19:47:25 +01:00
Laurent Destailleur
d3e7d61bed
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-18 19:42:30 +01:00
Laurent Destailleur
ef1285f050
css
2020-03-18 19:42:20 +01:00
Laurent Destailleur
9f65c4a7db
Merge pull request #13369 from OPEN-DSI/new-takepos-freezone-vat-rate
...
NEW add VAT rates on free zone in cash desk
2020-03-18 19:37:04 +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
a141f46e91
Merge pull request #13354 from OPEN-DSI/new-takepos-reduction-global-labels
...
NEW labels on reduction buttons in cash desk
2020-03-18 19:28:08 +01:00
Laurent Destailleur
8fa505422e
Merge pull request #13378 from atm-florian/develop
...
NEW: Export module, add extrafields for Contract and Contract line
2020-03-18 19:27:24 +01:00
Laurent Destailleur
ea13c707a2
Merge pull request #13380 from atm-john/11.0_fix_import_lines_from_object_for_situation_invoices
...
FIX import lines from object for situation invoices
2020-03-18 19:25:04 +01:00
Laurent Destailleur
8c34a091b4
Fix import
2020-03-18 19:24:11 +01:00
Laurent Destailleur
30b48a9ee3
Fix update
2020-03-18 19:21:32 +01:00
Laurent Destailleur
87edf27bbf
Merge branch 'develop' into dev_NEW_setup_SeparateurCSV
2020-03-18 19:12:52 +01:00
Laurent Destailleur
a56a3d64b3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-18 19:07:26 +01:00
Laurent Destailleur
b9f404b5fa
Fix form inside table
2020-03-18 19:07:15 +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
aeae8b4300
Merge pull request #13348 from aspangaro/12.0_a21
...
Work on reconcilation of accouting account
2020-03-18 18:56:03 +01:00
Laurent Destailleur
3f4a7b2387
Merge pull request #13350 from TobiasSekan/FixMissingUserInOdtSupProposal
...
FIX missing "contact_" substitution in supplier proposal (ODT template)
2020-03-18 18:55:03 +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
b41ac2a428
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-03-18 18:37:55 +01:00
Laurent Destailleur
a3328c5ef3
Fix div
2020-03-18 18:37:44 +01:00
Laurent Destailleur
bf10ad2041
Merge pull request #13357 from dolibit-ut/patch-17
...
Update
2020-03-18 18:31:52 +01:00
Laurent Destailleur
fc9ddd5447
Merge pull request #13356 from dolibit-ut/patch-16
...
Update https for country websites
2020-03-18 18:31:06 +01:00
Laurent Destailleur
f12881b3f8
Merge pull request #13360 from dolibit-ut/patch-20
...
create README.txt
2020-03-18 18:29:26 +01:00
Laurent Destailleur
5c881ee1d4
Merge pull request #13361 from dolibit-ut/patch-21
...
Create README.txt
2020-03-18 18:28:37 +01:00
Laurent Destailleur
e9e0ce591b
Merge pull request #13379 from atm-lena/11.0_FIX_extrafields_add_tpl_include
...
FIX : wrong include - replace extrafields_create.tpl.php to extrafiel…
2020-03-18 18:26:57 +01:00
Laurent Destailleur
1c76abb748
Merge pull request #13363 from dolibit-ut/patch-23
...
update https
2020-03-18 18:25:54 +01:00
Laurent Destailleur
11f2f12990
Merge pull request #13365 from dolibit-ut/patch-24
...
Update adodb-time.inc.php
2020-03-18 18:23:09 +01:00
Laurent Destailleur
c1931a045e
Merge pull request #13376 from fmarcet/11.0
...
FIX: Bank movements color is not showing
2020-03-18 18:22:46 +01:00
Laurent Destailleur
8a9d82e8d5
Merge pull request #13366 from dolibit-ut/patch-25
...
Create README.txt
2020-03-18 18:22:21 +01:00
Laurent Destailleur
889f1be0b6
Merge pull request #13367 from FHenry/dev_ldcompta10
...
fix ldcompta10
2020-03-18 18:21:55 +01:00
Laurent Destailleur
a848a8523a
Merge pull request #13377 from atm-john/11.0_fix_situations_invoices_stuff
...
Fix situations invoices stuff
2020-03-18 18:20:27 +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
florian HENRY
9bfc60064b
ass credential
2020-03-18 15:12:02 +01:00
florian HENRY
15614abc3f
NEW: add csv separator setup in module admin
2020-03-18 15:08:58 +01:00
Laurent Destailleur
cc93a40c45
Fix label of local tax
2020-03-18 14:06:15 +01:00
ATM john
c767e553d3
fix import line from object default value for situations
2020-03-18 10:59:13 +01:00
ATM john
7b8cafb710
remove var_dump
2020-03-18 10:34:44 +01:00
ATM john
d3aeec0a7c
Fix situation value transmission
2020-03-18 10:30:15 +01:00
atm-lena
2e1554def4
FIX : wrong include - replace extrafields_create.tpl.php to extrafields_add.tpl.php
2020-03-18 10:18:52 +01:00
florian HENRY
50a0bfef64
NEW: Export module, add extrafields for Contract and Contract line
2020-03-18 09:53:13 +01:00
Ferran Marcet
1fe4e4415e
FIX: Bank movements color is not showing
2020-03-18 09:27:08 +01:00
stickler-ci
1bff748c94
Fixing style errors.
2020-03-18 00:24:40 +00:00
Anthony Berton
82058f3a78
add phone
2020-03-18 01:17:54 +01:00
Anthony Berton
71e22ee11b
Update 11.0.0-12.0.0.sql
2020-03-18 00:55:20 +01:00
Anthony Berton
9fa4f245cc
Update list.php
2020-03-18 00:03:26 +01:00
Laurent Destailleur
a76392f944
Responsive
2020-03-17 21:26:25 +01:00
ATM john
075757eb3d
Fix situation value transmission
2020-03-17 16:49:05 +01:00
Alexandre SPANGARO
033f796398
Work on split module fournisseur
2020-03-17 14:51:48 +01:00
Laurent Destailleur
9525289488
Fix return code of some API
2020-03-17 13:50:20 +01:00
Laurent Destailleur
76fc722638
NEW Can get some variables (not available by default)
2020-03-17 13:33:21 +01:00
ATM john
cb43928a5d
Fix radio label target
2020-03-17 12:29:14 +01:00
Anthony Berton
fa2ccf6c44
Merge branch 'develop' into patch-17
2020-03-17 11:22:07 +01:00
Pierre Ardoin
26f6f04486
forgot ";"
2020-03-17 10:08:18 +01:00
Pierre Ardoin
564f412957
correction due to comments @hregis and @eldy
2020-03-17 10:04:43 +01:00
VESSILLER
0e171e81e6
Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-takepos-freezone-vat-rate
2020-03-17 09:57:21 +01:00
VESSILLER
a74dca4a20
FIX resolve conflicts
2020-03-17 09:52:26 +01:00
VESSILLER
f7cf5f8784
NEW add VAT rates in free zone for product/service in cash desk
2020-03-17 09:44:59 +01:00
Laurent Destailleur
4f442905b2
A new way to navigate between pages in list is available
2020-03-17 03:31:58 +01:00
Laurent Destailleur
5f255a6c14
A new way to navigate between pages in list is available
2020-03-17 03:24:24 +01:00
Laurent Destailleur
42271bb768
CSS
2020-03-17 02:30:19 +01:00
Laurent Destailleur
94750ed350
css
2020-03-17 01:31:48 +01:00
Laurent Destailleur
73f2e9e5de
WIP migrate num_paiement into num_payment
...
Fix label for free product in takepos
2020-03-16 19:23:18 +01:00
Laurent Destailleur
01724894ad
Fix useless BR
2020-03-16 18:33:06 +01:00
Laurent Destailleur
ffc861d4e2
FIX Autoadd product when barcode match
...
Show barcode value in tooltips
2020-03-16 18:04:22 +01:00
stickler-ci
74655b759c
Fixing style errors.
2020-03-16 16:34:28 +00:00
florian HENRY
105c2e9978
fix ldcompta10
2020-03-16 17:31:16 +01:00
Laurent Destailleur
1212a63365
css
2020-03-16 15:53:00 +01:00
Laurent Destailleur
c66f9476a8
Show owner of card in list
2020-03-16 15:49:58 +01:00
UT from dolibit
97639c4648
Create README.txt
2020-03-16 15:41:54 +01:00
Laurent Destailleur
4b1dd27c5f
Move takepos.php file into index.php to match other dir structure
2020-03-16 15:41:21 +01:00
UT from dolibit
58aa06b584
Update adodb-time.inc.php
...
See Wiki: https://adodb.org/dokuwiki/doku.php?id=v5:datetime:datetime_index
Download: https://github.com/ADOdb/ADOdb/blob/master/adodb-time.inc.php
2020-03-16 15:39:08 +01:00
UT from dolibit
5b1e8c4ebd
Update tcpdi.php
2020-03-16 14:44:26 +01:00
UT from dolibit
a8024b652c
Create README.txt
2020-03-16 14:31:09 +01:00
UT from dolibit
c8446662bf
create README.txt
2020-03-16 14:25:20 +01:00
UT from dolibit
1491414d5b
Update
...
1. add $help_url |DE:Modul_Benutzer
2. change comment 'Creation d'un champ optionnel' -> 'Creation of an optional field'
3. change comment 'Edition d'un champ optionnel ' -> 'Editing an optional field'
2020-03-16 13:34:12 +01:00
Laurent Destailleur
41ae8f6f68
TakePOS: Move all information of customer in the header
2020-03-16 13:27:10 +01:00
UT from dolibit
8e712c6d0e
Update https for country websites
...
Update https for country websites
2020-03-16 13:13:11 +01:00
Alexandre SPANGARO
6b168428d8
Merge remote-tracking branch 'upstream/develop' into 12.0_a22
2020-03-16 12:11:01 +01:00
VESSILLER
5a4bd28417
NEW labels on reduction buttons in cash desk
2020-03-16 11:56:47 +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
VESSILLER
350408d2ac
Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-takepos-group-same-product
2020-03-16 11:10:41 +01:00
Alexandre SPANGARO
301b97f6d2
FIX Update fiscalyear.class.php to filter on entity
2020-03-16 10:05:22 +01:00
Tobias Sekan
79caae9123
fix wrongly remoived center attributes
2020-03-16 09:59:58 +01:00
stickler-ci
711aff9ff7
Fixing style errors.
2020-03-16 08:56:10 +00:00
Tobias Sekan
41c0575a5d
Fix not working sorting in contact view
2020-03-16 09:51:12 +01:00
stickler-ci
fd4e807211
Fixing style errors.
2020-03-16 07:40:10 +00:00
Tobias Sekan
debecabe69
FIX missing "contact_" substitution in supplier proposal
2020-03-16 08:38:01 +01:00
Alexandre SPANGARO
191374cc8f
Work on reconcilation of accouting account
2020-03-16 08:07:05 +01:00
Tobias Sekan
c50f2b32d8
Add substitution for "user_civility" for ODT
2020-03-16 07:58:44 +01:00
Alexandre SPANGARO
af5444806d
Work on reconcilation of accouting account
2020-03-16 06:41:14 +01:00
stickler-ci
1f83e5ac54
Fixing style errors.
2020-03-15 21:30:46 +00:00
bahfir abbes
0ad68c180d
fix:Show units of products in stocks and hide total units if content is of diffents units
2020-03-15 22:26:23 +01:00
Laurent Destailleur
621c4ff4e7
Fix phpcs
2020-03-15 19:52:46 +01:00
Laurent Destailleur
22e8fdb46b
Enhance #13033
2020-03-15 13:57:31 +01:00
stickler-ci
1a97e7283f
Fixing style errors.
2020-03-15 12:09:52 +01:00
andreubisquerra
d7150fb592
Change cash control procedure
2020-03-15 12:09:52 +01:00
Laurent Destailleur
0764842ea9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-15 12:08:27 +01:00
Laurent Destailleur
27cc7ebe33
Fix regression
2020-03-15 12:08:09 +01:00
Laurent Destailleur
2cc68fec26
Update accountancy.lang
2020-03-15 11:13:46 +01:00
Laurent Destailleur
891bc52532
Update accountingaccount.class.php
2020-03-15 11:12:10 +01:00
Laurent Destailleur
1a273551be
Update accountingaccount.class.php
2020-03-15 11:11:12 +01:00
stickler-ci
375bcf8720
Fixing style errors.
2020-03-15 07:01:36 +00:00
Alexandre SPANGARO
789529c0e0
Work on reconciliation of accouting account
2020-03-15 07:55:35 +01:00
Alexandre SPANGARO
bc717bc6ae
Work on reconciliation of accouting account
2020-03-15 07:49:24 +01:00
Laurent Destailleur
92f4250a02
Fxi trans
2020-03-14 22:22:55 +01:00
Laurent Destailleur
54d9f6a703
Deprecated comment
2020-03-14 16:35:16 +01:00
Laurent Destailleur
aef827f826
Alias on same line than name
2020-03-14 14:47:01 +01:00
Laurent Destailleur
37fce0d3ee
Fix position on merou
...
Fix preselected value on contact
2020-03-14 14:45:37 +01:00
Laurent Destailleur
f92943bee2
css
2020-03-14 03:24:46 +01:00
Laurent Destailleur
0d2d2302d5
Removed not relevant graph on stats on project
2020-03-14 03:18:49 +01:00
Laurent Destailleur
8192e9dc67
FIX Missing token in form
2020-03-14 03:02:49 +01:00
Laurent Destailleur
6e71bb8707
Look and feel v12: Use color of status for dotnuts
2020-03-14 02:17:08 +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
8a9553522f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-03-14 00:14:52 +01:00
Laurent Destailleur
f774733fcb
Sync transifex
2020-03-14 00:14:42 +01:00
Laurent Destailleur
30bcf1d244
Uniformize code
2020-03-13 18:51:58 +01:00
Laurent Destailleur
880cfd1659
FIX #13332 Add more details on screen and help so it is easier to
...
understand the choices of the computer. Copy code into the automatic
binding to have rule consistent.
2020-03-13 18:10:00 +01:00
VESSILLER
1268bab958
Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-takepos-group-same-product
2020-03-13 17:27:04 +01:00
Laurent Destailleur
36873f2db7
Fix bad include
2020-03-13 17:22:54 +01:00
Laurent Destailleur
41a2304470
Merge pull request #13332 from aspangaro/12.0_a21
...
FIX: Accounting management of intra-community sales to a non-taxable thirdparty
2020-03-13 17:01:13 +01:00
Laurent Destailleur
a437125962
Merge pull request #13341 from OPEN-DSI/new-takepos-numbering-modules
...
NEW add numbering module for cash desk
2020-03-13 16:58:27 +01:00
Laurent Destailleur
6948e347c4
Merge pull request #13329 from atm-florian/fix_11_multiEntityOnCommCardElement
...
Fix 11 multi entity on comm card element
2020-03-13 16:57:10 +01:00
Laurent Destailleur
618d276349
Merge pull request #13335 from FHenry/dev_ldcompta10
...
NEW : accounting export LD compta version 10
2020-03-13 16:55:42 +01:00
Laurent Destailleur
4841a5bf4a
Fix look and feel v11
2020-03-13 16:53:37 +01:00
Laurent Destailleur
c605b743e6
Fix look and feel v11
2020-03-13 16:52:00 +01:00
Laurent Destailleur
99669583d5
Fix phpcs
2020-03-13 16:46:07 +01:00
florian HENRY
ca269864f7
let keep it to expedition
2020-03-13 14:55:34 +01:00
Laurent Destailleur
d90bf25351
Fix phpcs
2020-03-13 13:11:04 +01:00
Laurent Destailleur
33c5db9cc3
Prepare code for the new pagination possibility
2020-03-13 13:07:11 +01:00
Laurent Destailleur
52290b002a
NEW Another way to navigate between pages for some lists
2020-03-13 12:53:22 +01:00
Laurent Destailleur
893ae21d3a
Fix phpcs
2020-03-13 11:29:27 +01:00
Laurent Destailleur
1ff102f62a
Prepare 11.0.3
2020-03-13 10:31:28 +01:00
Laurent Destailleur
d3447bb44b
Fix duplicate /
2020-03-13 10:14:26 +01:00
Laurent Destailleur
3cf7105635
Fix language in sublang dir
2020-03-13 10:05:54 +01:00
Laurent Destailleur
4bd1c6c717
Fix hreflink
2020-03-13 09:51:41 +01:00
Laurent Destailleur
68f14ef483
Fix missing js
2020-03-13 09:37:26 +01:00
VESSILLER
826ed67921
FIX travis errors sql escape
2020-03-13 09:01:22 +01:00
Laurent Destailleur
6dda972ff5
Doxygen
2020-03-13 04:12:42 +01:00
Laurent Destailleur
29843165ec
Use the header and footer of public pages for the payment ok and ko page
2020-03-13 03:28:13 +01:00
Laurent Destailleur
35fae3ec5d
NEW Upgrade Stripe library to 6.43.1
2020-03-13 03:07:28 +01:00
Laurent Destailleur
f3996c0038
Code comment
2020-03-13 02:35:28 +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
f07d228537
Upgrade mobiledetect from 2.8.33 to 2.8.34
2020-03-13 02:28:01 +01:00
Laurent Destailleur
fede6da5cf
Move Chartjs into correct dir name
2020-03-13 02:17:15 +01:00
Laurent Destailleur
6f636d6d69
NEW Add field author public alias for blog post on website module
2020-03-12 20:50:36 +01:00
Laurent Destailleur
864c903d05
FIX #13294
2020-03-12 18:55:08 +01:00
Laurent Destailleur
7e428885cc
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-03-12 18:34:43 +01:00
VESSILLER
04c0332bee
FIX travis errors
2020-03-12 18:31:43 +01:00
VESSILLER
1379b2ce87
FIX travis errors
2020-03-12 18:21:44 +01:00
Laurent Destailleur
74b8b9f47d
Merge pull request #13340 from atm-lena/11.0_FIX_loadCacheMsgTicket_PrivateStatus
...
FIX - Ticket Public - Private messages are displayed
2020-03-12 17:59:13 +01:00
Laurent Destailleur
6d9967a5d3
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-03-12 17:59:03 +01:00
Laurent Destailleur
dea03efd4f
Look and feel v11
2020-03-12 17:58:51 +01:00
VESSILLER
70ebc61c1f
Module TakePos - NEW add numbering module for cash desk
2020-03-12 17:43:59 +01:00
Laurent Destailleur
09359b8025
Merge pull request #13338 from altatof/box_shipments
...
FIX : missing class declaration
2020-03-12 17:06:50 +01:00
Laurent Destailleur
aa3b28a8be
Merge pull request #13337 from simicar29/11.0
...
Load line extrafields when fetching supplier invoice
2020-03-12 17:06:26 +01:00
Laurent Destailleur
69931efb6c
FIX #10864
2020-03-12 17:01:07 +01:00
atm-lena
ca121dd689
FIX - Ticket - Load Cache Messages Ticket, wrong message's status
2020-03-12 16:21:11 +01:00
Laurent Destailleur
967d4223c6
FIX #13277
2020-03-12 16:15:48 +01:00
altairis
6618205e6f
fix missing class declaration
2020-03-12 15:05:32 +01:00
Laurent Destailleur
b9883523f1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-12 13:08:56 +01:00
Laurent Destailleur
6f0f1e1163
Fix edit of country of establishment
2020-03-12 13:08:42 +01:00
Laurent Destailleur
d380da3f4c
Merge pull request #13250 from FHenry/dev_fix_createLineWithCOrrectLink
...
NEW : special option MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION to store in document line created form other documents lines the id of original lines and origin class line rather than origin object id and origin object type
2020-03-12 12:57:04 +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
0babab2824
Fixing style errors.
2020-03-12 11:48:08 +00:00
Laurent Destailleur
2994a5f35e
Merge pull request #13336 from Dolibarr/scrutinizer-patch-2
...
Scrutinizer Auto-Fixes
2020-03-12 12:47:52 +01:00
Laurent Destailleur
54b32d94e0
Fix field required
2020-03-12 12:47:08 +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
simicar29
325d635c48
Load line extrafields when fetching supplier invoice
...
PR to load extrafield values of lines when fetchinf supplier invoice.
2020-03-12 12:43:06 +01:00
Laurent Destailleur
f38134e44d
Fix non transversable var
2020-03-12 12:42:34 +01:00
Laurent Destailleur
dfe947885c
FIX params of setEventMessage($langs->trans('ErrorProductClone')...
2020-03-12 12:40:28 +01:00
Laurent Destailleur
31865d7ae5
Fix doc
2020-03-12 12:39:21 +01:00
florian HENRY
8e473ee365
Merge branch 'dev_ldcompta10' of github.com:FHenry/dolibarr into dev_ldcompta10
2020-03-12 12:28:30 +01:00
florian HENRY
075f0a82c2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_ldcompta10
2020-03-12 12:28:06 +01:00
florian HENRY
c5a4adf63f
update doc
2020-03-12 12:25:19 +01:00
Laurent Destailleur
5dc403cb66
FIX #13304
2020-03-12 12:19:24 +01:00
Laurent Destailleur
ad22820872
FIX #13313
2020-03-12 12:15:44 +01:00
Laurent Destailleur
e7ce9c16cb
FIX #13313
2020-03-12 12:15:16 +01:00
Laurent Destailleur
c1e5178eeb
Doc
2020-03-12 12:01:40 +01:00
stickler-ci
85c8296e10
Fixing style errors.
2020-03-12 10:59:08 +00:00
florian HENRY
310bdf6062
NEW : accounting export LD compta version 10
2020-03-12 11:55:26 +01:00
Laurent Destailleur
d6a35db754
Look and feel v12
2020-03-12 11:13:50 +01:00
Laurent Destailleur
a6f8608ffd
Fix when undefined key
2020-03-12 11:09:18 +01:00
VESSILLER
e7056a9ade
NEW add a parameter to group same product
2020-03-12 11:00:17 +01:00
Laurent Destailleur
2ae7cfeffa
Fix fields
2020-03-12 10:56:25 +01:00
florian HENRY
eaa9d22783
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_fix_createLineWithCOrrectLink
2020-03-12 09:45:04 +01:00
florian HENRY
29b2ea77d5
NEW : special option MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION to store in document line created form other document s lines the id of origin lines and origin class line rather than origin object id and origin object type
2020-03-12 09:44:43 +01:00
Alexandre SPANGARO
59e4b3d634
FIX: Accounting management of intra-community sales to a non-taxable thirdparty
...
Related to this discussion :
https://www.dolibarr.fr/forum/t/gestion-des-comptes-de-vente-intracommunautaire-et-vente-ce-non-exemptee-de-tva/32285
2020-03-12 04:56:36 +01:00
Laurent Destailleur
6ce6dc145f
Use colors of status in donut
2020-03-12 02:20:31 +01:00
Laurent Destailleur
fb8e565b53
Better position on screen
2020-03-12 00:13:42 +01:00
Laurent Destailleur
af227ae164
Add picto on selection of terminal button
2020-03-11 23:57:36 +01:00
Laurent Destailleur
54da1e73ff
Option to show the n first line of desc into the basket
2020-03-11 23:56:48 +01:00
Laurent Destailleur
efeda2e747
Fix add global check on perm
2020-03-11 20:14:33 +01:00
Laurent Destailleur
7b93b39bb8
Merge pull request #13310 from OPEN-DSI/new-takepos-ticket-paid
...
NEW no confirm discard ticket if paid
2020-03-11 20:08:40 +01:00
Laurent Destailleur
c3b51b177e
Merge pull request #13327 from OPEN-DSI/new-takepos-auto-print-ticket-paid
...
NEW only auto print paid ticket in cash desk
2020-03-11 20:07:50 +01:00
Laurent Destailleur
5d5b2b8183
Merge pull request #13328 from OPEN-DSI/new-takepos-payment-method
...
NEW set payment method on paid ticket in cash desk
2020-03-11 19:26:10 +01:00
Laurent Destailleur
fc05e8d768
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/bookmarks/bookmarks.lib.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/langs/en_US/other.lang
2020-03-11 18:03:15 +01:00
florian HENRY
6edaa7ac11
fix getentity on comm/card.php
2020-03-11 18:00:35 +01:00
florian HENRY
c4610fee8b
Merge branch '11.0' of github.com:Dolibarr/dolibarr into fix_11_multiEntityOnCommCardElement
2020-03-11 17:58:51 +01:00
florian HENRY
f40c8ce507
fix getentity on comm/card.php
2020-03-11 17:58:41 +01:00
VESSILLER
5d740d16fb
NEW set payment method on paid ticket in cash desk
2020-03-11 17:42:30 +01:00
VESSILLER
e4c97f0b15
FIX user permission on ajax request getInvoice
2020-03-11 17:16:44 +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
89a8531140
Merge pull request #13237 from aspangaro/12.0_a18
...
NEW: Accountancy - Add mode intra & export for product or service bought
2020-03-11 17:08:49 +01:00
Laurent Destailleur
4088553d61
Merge pull request #13321 from OPEN-DSI/new-takepos-product-sorted-by-label
...
NEW add a parameter to sort product by label in cash desk
2020-03-11 17:07:30 +01:00
Laurent Destailleur
40973cfca9
Merge pull request #13320 from OPEN-DSI/new-takepos-search-on-keycode
...
New takepos search on keycode
2020-03-11 17:07:03 +01:00
Laurent Destailleur
8609bf9c9c
Merge pull request #13318 from OPEN-DSI/new-takepos-payment-buttons
...
NEW add icon on payment buttons in cash desk
2020-03-11 17:06:04 +01:00
Laurent Destailleur
57440cc0dd
Merge pull request #13311 from OPEN-DSI/new-takepos-categories-sorted
...
NEW categories and subcategories sorted by label in TakePOS
2020-03-11 17:05:40 +01:00
Laurent Destailleur
4903287204
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/boxes/box_commandes.php
htdocs/fourn/class/fournisseur.commande.class.php
2020-03-11 17:04:28 +01:00
Laurent Destailleur
27bdee9df1
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-03-11 17:01:47 +01:00
Laurent Destailleur
c9b715b7ad
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-03-11 17:01:31 +01:00
Laurent Destailleur
7afbb5ce9c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2020-03-11 17:00:01 +01:00
Laurent Destailleur
467dc2da7a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2020-03-11 16:59:35 +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
VESSILLER
e95e182419
NEW only auto print paid ticket in cash desk
2020-03-11 16:53:27 +01:00
Laurent Destailleur
a9847f0d40
Merge pull request #13308 from TobiasSekan/NewCategoryFilterForBankList
...
NEW category filter for bank list
2020-03-11 16:50:12 +01:00
Laurent Destailleur
36e6dd9d8e
Merge pull request #13254 from Tim-Otte/add-odt-converter
...
NEW Support some HTML contents into ODT documents
2020-03-11 16:49:39 +01:00
Laurent Destailleur
a25cf8448d
Merge pull request #13306 from andreubisquerra/develop
...
Black head bar with Colorfull TakePOS theme
2020-03-11 16:48:05 +01:00
Laurent Destailleur
7e574e0429
Fix permissions
2020-03-11 16:47:42 +01:00
Laurent Destailleur
4bdf10c995
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2020-03-11 16:44:03 +01:00
Laurent Destailleur
ae5d94b01c
Merge pull request #13323 from aspangaro/11.0_p5
...
Fix accounting files link on auguria menu
2020-03-11 16:43:10 +01:00
Laurent Destailleur
27e32fc353
Merge pull request #13305 from andreubisquerra/master
...
Move customer name to TakePOS headbar
2020-03-11 16:42:32 +01:00
Laurent Destailleur
13ffc186b7
Merge pull request #13324 from atm-florianm/FIX_10.0_status_column_empty_in_invoices_box_when_using_MAIN_STATUS_USES_CSS
...
FIX 10.0 - status missing from last customer invoices box when using MAIN_STATUS_USES_CSS
2020-03-11 16:41:24 +01:00
Laurent Destailleur
b821225382
Merge pull request #13326 from OPEN-DSI/new-takepos-reduction-global
...
NEW add global reduction in cash desk
2020-03-11 16:40:34 +01:00
Laurent Destailleur
8808b7df87
Merge pull request #13325 from atm-florianm/FIX_10.0_load_langs_in_box_commandes
...
FIX 10.0 - missing translations for "orders" homepage "orders" box
2020-03-11 16:39:43 +01:00
Laurent Destailleur
838b6d1e71
Merge pull request #13316 from atm-florian/11.0
...
fix PHP Fatal error: Uncaught Error: Call to undefined function newToken()
2020-03-11 16:34:59 +01:00
Laurent Destailleur
25eae4db9c
Fix missing __USER_EMAIL__ substitution
2020-03-11 16:28:00 +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
c8bbaa07fd
FIX Look and feel v11
2020-03-11 15:53:08 +01:00
VESSILLER
fc4a98b29c
NEW add const TAKEPOS_NUMPAD_USE_PAYMENT_ICON to use icons on payment buttons
2020-03-11 15:36:36 +01:00
atm-lena
20aa51f26b
FIX - Clone Fourn Command, add line's extrafields Part 2
2020-03-11 15:26:49 +01:00
Laurent Destailleur
65fbc24b36
Work on migration script
2020-03-11 14:53:06 +01:00
Laurent Destailleur
406c333849
Fix trans
2020-03-11 13:55:57 +01:00
Laurent Destailleur
26fec2f366
Enhance website
2020-03-11 12:53:41 +01:00
VESSILLER
898007f0b4
NEW add global reduction in cash desk
2020-03-11 12:30:07 +01:00
Florian Mortgat
ce01cf278d
FIX 10.0 - translations for "orders" not loaded in the homepage box
2020-03-11 11:45:57 +01:00
Florian Mortgat
6d1f62c1d9
FIX 10.0 - status missing from last customer invoices box when using MAIN_STATUS_USES_CSS
2020-03-11 11:03:19 +01:00
Laurent Destailleur
c4b5a6f54b
CSS
2020-03-11 11:00:57 +01:00
VESSILLER
e4608a1ee5
FIX add only one product if no key code defined
2020-03-11 09:15:52 +01:00
Alexandre SPANGARO
f2b33c0d77
Fix accounting files link on auguria menu
2020-03-11 06:20:25 +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
Laurent Destailleur
d6966dd429
Add method to count number of blogs in website
2020-03-10 15:59:48 +01:00
Laurent Destailleur
078112c649
Fix trans
2020-03-10 15:19:24 +01:00
atm-lena
35f32391a0
FIX - Clone Fourn Command, add line's extrafields
2020-03-10 14:46:15 +01:00
VESSILLER
8f768c6eca
NEW add a parameter to sort product by label in cash desk
2020-03-10 14:33:58 +01:00
VESSILLER
31e59bbe87
NEW add product if only one found
2020-03-10 14:18:39 +01:00
VESSILLER
cef2685368
NEW search on key code "enter" if defined in cash desk
2020-03-10 14:08:28 +01:00
VESSILLER
e2a918b9d2
FIX blank failure
2020-03-10 11:33:39 +01:00
VESSILLER
c707cef022
NEW add icon on payment buttons in cash desk
2020-03-10 11:20:15 +01:00
Tobias Sekan
60944c92a8
Fix error on add a line to a supplier order
2020-03-10 09:02:38 +01:00
florian HENRY
8d2ece83b7
Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0
2020-03-10 09:00:59 +01:00
florian HENRY
3d279094c1
fix PHP Fatal error: Uncaught Error: Call to undefined function newToken()
2020-03-10 09:00:51 +01:00
Laurent Destailleur
935aa4e71e
Fix export ebsite tool
2020-03-09 23:12:56 +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
b1bb7de2fb
FIX CSRF error when creating an intervention
2020-03-09 20:19:28 +01:00
Laurent Destailleur
e66313d47e
FIX use bad var to check if total is positive for each VAT rate when
...
validating invoice.
2020-03-09 20:06:47 +01:00
Laurent Destailleur
b81c02de04
Fix home page after first page creation
2020-03-09 19:50:01 +01:00
Laurent Destailleur
a937fc8ef1
Fix home page after first page creation
2020-03-09 19:49:14 +01:00
Laurent Destailleur
99b1c773a7
FIX link when using anchor on "/"
2020-03-09 18:56:52 +01:00
Laurent Destailleur
86f6736a18
Fix phpcs
2020-03-09 18:55:47 +01:00
Laurent Destailleur
e536ee87b8
FIX link when using anchor on "/"
2020-03-09 18:54:34 +01:00
VESSILLER
07eda6a2c3
NEW categories and subcategories sorted by label (takepos)
2020-03-09 17:56:09 +01:00
VESSILLER
99d5b175c6
NEW no confirm discard ticket if paid
2020-03-09 17:40:32 +01:00
Laurent Destailleur
82f0d8a3bc
Fix bad params
2020-03-09 17:38:47 +01:00
Tim Otte
26deae9dbc
Fixed the regex string used to extract the attributes from the html tag
2020-03-09 15:37:23 +01:00
Laurent Destailleur
ca4c62be56
Fix var init
2020-03-09 13:56:25 +01:00
Tobias Sekan
9dd362a22c
NEW Category filter on bank list
2020-03-09 11:43:15 +01:00
Laurent Destailleur
788692f964
Trans
2020-03-09 09:19:47 +01:00
Laurent Destailleur
84606f29c0
Trans
2020-03-09 09:14:25 +01:00
Laurent Destailleur
6203e042b1
Trans
2020-03-09 09:10:06 +01:00
andreubisquerra
4d3e91fbc3
Black head bar with Colorfull TakePOS theme
2020-03-08 23:10:49 +01:00
andreubisquerra
5b7183efdd
Empty by default
2020-03-08 22:40:22 +01:00
jove@bisquerra.com
e71d312acd
Customer name on TakePOS headbar
2020-03-08 22:33:56 +01:00
Laurent Destailleur
1fb6d1d43d
FIX menu export document was not visible when using "simple accounting"
2020-03-08 20:49:50 +01:00
Laurent Destailleur
067759bf04
Fix graph for lines
2020-03-08 20:22:46 +01:00
Laurent Destailleur
3edc3dd382
Fix fields definition
2020-03-08 20:10:31 +01:00
Laurent Destailleur
343a80fd3d
Fix table fields
2020-03-08 19:25:00 +01:00
Laurent Destailleur
d9b0083923
Enhance modulebuilder
2020-03-08 18:28:31 +01:00
Laurent Destailleur
ff02b414cc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-08 18:26:58 +01:00
Laurent Destailleur
fefb3fdde7
Fix permissions on restricArea for external modules
2020-03-08 18:26:41 +01:00
Laurent Destailleur
068f435146
Merge pull request #13302 from andreubisquerra/develop
...
Avoid higher payments than remain in TakePOS
2020-03-08 18:19:53 +01:00
Laurent Destailleur
f000d49bf1
Merge pull request #13301 from andreubisquerra/master
...
Remove unused variables in TakePOS
2020-03-08 18:18:51 +01:00
Laurent Destailleur
42d417d5d5
Trans
2020-03-08 16:32:00 +01:00
andreubisquerra
2af9904c04
Avoid higher payments than remain in TakePOS
2020-03-07 22:56:43 +01:00
jove@bisquerra.com
73f7c8958b
Remove unused variables in TakePOS
2020-03-07 22:07:20 +01:00
Laurent Destailleur
c4a429fb56
Merge pull request #13298 from jtraulle/patch-3
...
Fix Call to a member function getMessage() on null
2020-03-07 17:40:33 +01:00
Laurent Destailleur
26e0d63e31
Merge pull request #13297 from jtraulle/11.0
...
Fix #13296
2020-03-07 17:39:41 +01:00
Laurent Destailleur
148e2e58e5
Fix MAIN_SHOW_LOGO
2020-03-07 17:37:08 +01:00
Laurent Destailleur
119784fb3d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-07 17:34:01 +01:00
Laurent Destailleur
6424e50ba4
Enhance of colors in graph
2020-03-07 16:45:28 +01:00
Laurent Destailleur
44a611e006
Move getElementProperties and fetchObjectByElement into functions
2020-03-07 15:06:14 +01:00
Laurent Destailleur
e5bb6615b2
Fix remove warning
2020-03-06 20:06:56 +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é
f7dda657b1
Fix Call to a member function getMessage() on null
...
Because we are not in the exception block, $e is necessarily undefined.
Thus replacing $e->getMessage(); by value of $paymentintent->status.
2020-03-06 17:46:45 +01:00
Jean Traullé
a6e3980acb
Update ihm.php
2020-03-06 17:35:03 +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
Jean Traullé
ddf87e6d80
Fix param lost
...
Reported on https://www.dolibarr.fr/forum/t/v11-petites-regressions/32228
2020-03-06 16:13:09 +01:00
Laurent Destailleur
6b5707432d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-06 15:05:28 +01:00
Laurent Destailleur
cdec58a527
Clean old code
2020-03-06 15:05:18 +01:00
Laurent Destailleur
c545767e38
Fix @ before var
2020-03-06 14:58:41 +01:00
Laurent Destailleur
eeb219cb55
Revert "NEW sorting elements on project overview"
2020-03-06 14:52:29 +01:00
Laurent Destailleur
48661ad88e
Merge pull request #13290 from TobiasSekan/NewSortingForProjectOverview
...
NEW sorting elements on project overview
2020-03-06 14:44:48 +01:00
Laurent Destailleur
054ffb7547
Depreciate variables not used by Dolibarr.
2020-03-06 14:38:06 +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
aaf9aef5c8
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/contrat/list.php
2020-03-06 14:17:21 +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
Scrutinizer Auto-Fixer
4ab671338b
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-06 13:11:44 +00:00
Laurent Destailleur
dc0e96a6e5
Fix scrutinizer
2020-03-06 14:09:00 +01:00
Laurent Destailleur
c4a9824685
Fix isMultiLang
2020-03-06 13:44:15 +01:00
Laurent Destailleur
adc996ee0a
FIX #13194
2020-03-06 13:19:17 +01:00
Laurent Destailleur
ad9d0a3472
Fix graph of product distribution when too much record
2020-03-06 12:45:02 +01:00
Tobias Sekan
eceaf5b321
Fix Travis CI error
2020-03-06 12:09:50 +01:00
Laurent Destailleur
5ff4b638a5
FIX empty of series in graph of product distribution
2020-03-06 12:00:40 +01:00
Laurent Destailleur
8e9d4e408f
FIX empty of series in graph of product distribution
2020-03-06 11:59:06 +01:00
Laurent Destailleur
e2396919d4
FIX chart of product distribution
2020-03-06 11:52:32 +01:00
Tobias Sekan
8c115a07b0
Fix lint errors
2020-03-06 11:49:49 +01:00
stickler-ci
03b8c86c06
Fixing style errors.
2020-03-06 10:45:35 +00:00
Tobias Sekan
acd7366d64
fix not working unlink
2020-03-06 11:33:42 +01:00
atm-greg
eafff58a54
fix countable warning
2020-03-06 11:30:45 +01:00
Tobias Sekan
3e58cc4c02
Fix build errors
2020-03-06 11:25:02 +01:00
Tobias Sekan
05e76ba122
Fix wrong merge (new MRP things was missing)
2020-03-06 10:21:34 +00: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
722777d348
Add lib
2020-03-06 10:34:14 +01:00
Laurent Destailleur
47ebc2bbf2
Hide legend
2020-03-06 09:52:51 +01:00
ATM-Nicolas
a9d7bbc2ed
FIX : Remove unexisting link
2020-03-06 09:52:19 +01:00
Laurent Destailleur
ea658ebe72
Fix setShowLegend with chartjs
2020-03-06 09:51:30 +01:00
Laurent Destailleur
201f9badeb
elseif
2020-03-06 09:22:21 +01:00
Laurent Destailleur
f9546fc50e
Fix dolgraph
2020-03-06 09:21:04 +01:00
Laurent Destailleur
e8407e3f0b
Merge pull request #13283 from OPEN-DSI/10.0
...
FIX substitute lines dates values on doc generator (ODT, ...)
2020-03-06 09:19:50 +01:00
Laurent Destailleur
3f6cc8142d
Flag v12 alpha
2020-03-06 09:18:33 +01:00
Laurent Destailleur
32ee3122ac
More accurate code
2020-03-06 02:24:24 +01:00
Laurent Destailleur
fff7ee3e96
FIX #13285 SQL error during migration with pgsql
2020-03-06 01:55:36 +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
92d6661483
Fix trans
2020-03-05 21:59:44 +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
Tobias Sekan
a155409bc2
Add sorting for project overview columns
2020-03-05 14:16:56 +01:00
Laurent Destailleur
2da459c561
Fix theme
2020-03-05 12:44:09 +01:00
Tim Otte
1472a24371
Added missing line break replacement when the values do not contain html tags
2020-03-05 09:41:22 +01:00
Laurent Destailleur
5a22fb11ef
css
2020-03-05 03:23:54 +01:00
Laurent Destailleur
85c1e2a670
Fix regression css
2020-03-05 03:20:06 +01:00
Laurent Destailleur
1a9506150e
NEW Can filter on donation status in list
2020-03-05 03:04:53 +01:00
Laurent Destailleur
fc31680bd0
Several fix for chart.js graphs
2020-03-05 02:55:06 +01:00
Laurent Destailleur
f35f0ecf9d
Look and feel v12
2020-03-05 01:54:12 +01:00
Laurent Destailleur
45bcd1c3bf
Code simpler
2020-03-05 01:50:53 +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
c2e5830f9b
Fix phpcs
2020-03-05 00:22:51 +01:00
Laurent Destailleur
a5a2d60755
Fix phpcs
2020-03-05 00:20:39 +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
0766097658
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-04 19:28:24 +01:00
Laurent Destailleur
a6d340a22c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/filefunc.inc.php
2020-03-04 19:28:15 +01:00
Christian Foellmann
55dc3d36ac
fix broken categories on "contacts" tab of project
2020-03-04 19:25:48 +01:00
Laurent Destailleur
4a77505032
Merge pull request #13278 from cfoellmann/fix-missing-lang-usage
...
add missing translation string "Usage" (projects)
2020-03-04 19:25:19 +01:00
Laurent Destailleur
deda6252f2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/lib/functions.lib.php
htdocs/expensereport/class/expensereport.class.php
2020-03-04 19:22:30 +01:00
Laurent Destailleur
f92dc4399d
Merge pull request #13276 from cfoellmann/fix-project-contacts-cat
...
fix broken categories on "contacts" tab of project
2020-03-04 19:18:11 +01:00
Laurent Destailleur
e2162a7b33
Merge pull request #13275 from TobiasSekan/NewSortingForContactsOf
...
NEW Add sorting for contacts of ... pages
2020-03-04 19:17:41 +01:00
Laurent Destailleur
f0e8325eb4
Merge pull request #13271 from FrederikHeinrich/patch-1
...
Fix
2020-03-04 19:13:15 +01:00
Christian Foellmann
b0f1af8433
add missing translation string "Usage" (projects)
2020-03-04 15:18:50 +01:00
Christian Foellmann
e052520882
fix broken categories on "contacts" tab of project
2020-03-04 14:50:10 +01:00
stickler-ci
92cc947623
Fixing style errors.
2020-03-04 12:41:52 +00:00
Laurent Destailleur
ddc0547eda
Fix position of button
2020-03-04 13:31:19 +01:00
Tobias Sekan
f823feba52
Add sorting for "Contacts of ..."
2020-03-04 13:31:19 +01:00
atm-arnaud
834873ab15
FIX date order was -1D and desc with label repetition
2020-03-04 11:58:42 +01:00
Laurent Destailleur
50d76ae0e8
FIX Bad permission to access menu Statistics on intervention.
2020-03-04 11:51:32 +01:00
Laurent Destailleur
2b65dff8a2
FIX Bad permission to access menu Statistics on intervention.
2020-03-04 11:48:43 +01:00
Laurent Destailleur
c66b0fe383
css
2020-03-04 11:46:49 +01:00
Laurent Destailleur
47d13a27df
NEW Upgrade ace to 1.4.8 - Upgrade select2 to 4.0.13
2020-03-04 11:43:48 +01:00
Freddi
96bbba0301
Update fichinter.class.php
...
adding ",'showoncombobox'=>1" for a better View
2020-03-04 10:20:28 +01:00
Laurent Destailleur
f586c3b0c8
Prepare 11.0.2
2020-03-04 10:13:55 +01:00
stickler-ci
e2f749b5ee
Fixing style errors.
2020-03-04 09:10:29 +00:00
Freddi
b4ef25df71
Update fichinter.class.php
2020-03-04 10:09:48 +01:00
stickler-ci
47d632a394
Fixing style errors.
2020-03-04 09:05:20 +00:00
Freddi
f17763f400
Update fichinter.class.php
2020-03-04 10:02:02 +01:00
Tim Otte
6b3fdfbcd8
Moved the HtmlToOdtConverter class into the odf class
2020-03-04 08:54:49 +01:00
Laurent Destailleur
60eabb0e8a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-04 02:15:51 +01:00
Laurent Destailleur
f357661745
Fix PHPCS
2020-03-04 02:14:40 +01:00
Laurent Destailleur
24f416d0dd
Fix default content of page
2020-03-04 02:03:29 +01:00
Laurent Destailleur
7d0d0aa75a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
2020-03-04 01:56:50 +01:00
Laurent Destailleur
0b37c2c201
FIX #13263
2020-03-04 00:53:07 +01:00
Laurent Destailleur
109770f5c3
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-03-04 00:38:53 +01:00
Laurent Destailleur
5f417039f6
More log to help debug
2020-03-04 00:38:43 +01:00
Laurent Destailleur
71f19b4e5e
FIX #13267
2020-03-04 00:38:04 +01:00
Laurent Destailleur
70d4e5d7e3
Fix button should not be visible
2020-03-03 23:51:17 +01:00
Laurent Destailleur
88059a52d8
Merge branch 'develop' into patch-17
2020-03-03 23:24:14 +01:00
Laurent Destailleur
1ee52d4c63
Enhancement of #13240
2020-03-03 23:19:05 +01:00
Laurent Destailleur
4f7da118d6
Merge pull request #13240 from AlexLudwigITDienstleistungen/patch-1
...
Resolve Error if dolibarr is running in docker container
2020-03-03 23:16:01 +01:00
Laurent Destailleur
537d129627
Merge pull request #13251 from bb2a/patch-20
...
NEW Add subtitution variables for url of document in backoffice
2020-03-03 23:13:53 +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
c80e37edf6
Merge pull request #13259 from ptibogxiv/patch-310
...
FIX: fk_type subscription list via api REST
2020-03-03 23:11:47 +01:00
Laurent Destailleur
7866f89585
Merge pull request #13260 from atm-quentin/FIX_ecm_files
...
FIX ecm_files didnt match cause document ref contained "/"
2020-03-03 23:09:02 +01:00
Laurent Destailleur
6f3197bbea
Merge pull request #13258 from atm-ph/fix_11.0_dict_sql_error_sortorder
...
Fix sql syntax error
2020-03-03 22:54:11 +01:00
Laurent Destailleur
21173b8b9d
Merge pull request #13262 from ptibogxiv/patch-312
...
FIX doc
2020-03-03 22:53:51 +01:00
Laurent Destailleur
d5546df57b
Responsive
2020-03-03 22:50:37 +01:00
Laurent Destailleur
fd64f0fadb
Fix responsive
2020-03-03 22:46:29 +01:00
Laurent Destailleur
88d2e13f02
Fix reponsive
2020-03-03 22:15:55 +01:00
Laurent Destailleur
2d64b8c2f9
Merge pull request #13261 from ptibogxiv/patch-311
...
NEW get proposal by ref with API
2020-03-03 21:45:17 +01:00
Laurent Destailleur
c3137142fe
Merge pull request #13252 from aspangaro/12.0_a20
...
FIX: Nowrap on amount
2020-03-03 21:44:54 +01:00
Regis Houssin
945641a05b
FIX missing global $conf
2020-03-03 16:26:57 +01:00
Laurent Destailleur
730b8ed932
CSS
2020-03-03 16:09:33 +01:00
Laurent Destailleur
a22296ca72
Trans
2020-03-03 15:19:37 +01:00
Laurent Destailleur
b587ac6936
FIX responsive
2020-03-03 15:14:27 +01:00
Laurent Destailleur
be30667dbe
FIX responsive
2020-03-03 15:13:55 +01:00
Laurent Destailleur
13fb5eda83
Fix for md theme
2020-03-03 15:11:14 +01:00
ptibogxiv
a71356f0ed
FIX doc
2020-03-03 13:41:19 +01:00
ptibogxiv
b6bad0c936
Update api_proposals.class.php
2020-03-03 13:40:26 +01:00
ptibogxiv
fa5aeebcd8
NEW get proposal by ref with API
2020-03-03 13:39:22 +01:00
atm-quentin
9446138951
FIX ecm_files didnt match cause document ref contained "/"
2020-03-03 12:07:18 +01:00
ptibogxiv
060df57cb1
FIX: fk_type subscription list via api REST
...
v10 to dev
2020-03-03 11:58:15 +01:00
atm-ph
e916ff40ff
Fix sql syntax error
2020-03-03 11:55:05 +01:00
Marc de Lima Lucio
5f5824daaa
FIX: order list: remove useless multicurrency lines
2020-03-03 10:43:23 +01:00
Tim Otte
667f00872c
Fixed lint errors
2020-03-03 10:33:26 +01:00
stickler-ci
f026b959a2
Fixing style errors.
2020-03-03 09:28:00 +00:00
Tim Otte
8ce1f5f360
Fixed a few bugs
...
Added custom font-families
2020-03-03 10:19:05 +01:00
Marc de Lima Lucio
1735b22be9
NEW: supplier proposal list: enable multicurrency columns
2020-03-03 10:11:40 +01:00
Marc de Lima Lucio
b58608dab0
NEW: supplier order list: enable multicurrency columns
2020-03-03 09:56:25 +01:00
Anthony Berton
2fd7276a30
Update functions.lib.php
2020-03-03 09:53:00 +01:00
Marc de Lima Lucio
1c912659eb
NEW: supplier invoice list: enable multicurrency columns
2020-03-03 09:38:05 +01:00
Alexandre SPANGARO
aeb3f70df7
FIX: Nowrap on amount
2020-03-03 07:26:51 +01:00
Alexandre SPANGARO
99b02fca47
Fix error
2020-03-03 05:18:45 +01:00
Alexandre SPANGARO
278dfce301
Fix not logical use
2020-03-03 05:16:14 +01:00
Alexandre SPANGARO
fbd7dc66b2
Fix error
2020-03-03 05:06:31 +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
799e795871
Merge pull request #13242 from javierybar/develop
...
NEW TakePOS numbering
2020-03-02 23:27:26 +01:00
javierybar
8776880a12
Update terminal.php
2020-03-02 22:51:06 +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
javierybar
4aced13dbf
Update terminal.php
2020-03-02 22:47:12 +01:00
javierybar
9d869587cc
Update setup.php
2020-03-02 22:39:56 +01:00
Laurent Destailleur
b9e5f349a1
Merge pull request #13249 from hregis/11.0_bug
...
FIX modFournisseur is required by modSupplierProposal
2020-03-02 22:01:39 +01:00
Laurent Destailleur
46bf65704a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-02 21:59:56 +01:00
Laurent Destailleur
87fe2e691b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/product/stats/facture.php
htdocs/product/stats/facture_fournisseur.php
2020-03-02 21:59:34 +01:00
Laurent Destailleur
b4dd5dd063
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-02 21:51:49 +01:00
Laurent Destailleur
5957f86b1e
css for takepos and md theme
2020-03-02 21:51:13 +01:00
Laurent Destailleur
ea7c2aa46b
Update functions.lib.php
2020-03-02 21:47:36 +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
Laurent Destailleur
c47ddb8bca
Merge pull request #13245 from aspangaro/12.0_a19
...
NEW: Bookkeeping - Add link to document & pdf
2020-03-02 21:44:27 +01:00
Laurent Destailleur
c9d7ea8998
Merge pull request #13241 from ptibogxiv/patch-309
...
NEW: api invoice get by ref
2020-03-02 21:39:17 +01:00
Laurent Destailleur
389d25a588
Merge pull request #13243 from andreubisquerra/develop
...
Fix terminal popup in new TakePOS head bar
2020-03-02 21:29:38 +01:00
Laurent Destailleur
e9d0831cf8
Merge branch 'develop' into abb90064
2020-03-02 21:15:46 +01:00
Laurent Destailleur
7e2c2913bc
Update myobject.class.php
2020-03-02 21:13:02 +01:00
Laurent Destailleur
86f0d6db41
Update myobject.class.php
2020-03-02 21:06:57 +01:00
Laurent Destailleur
2ca5532a21
Update myobject.class.php
2020-03-02 21:03:59 +01:00
Laurent Destailleur
05556a77af
Fix css
2020-03-02 19:37:16 +01:00
Anthony Berton
d9a002a8bd
Update functions.lib.php
2020-03-02 19:27:36 +01:00
Anthony Berton
197f81cb52
Update functions.lib.php
2020-03-02 19:23:45 +01:00
Anthony Berton
12b9897f5c
Update functions.lib.php
2020-03-02 18:53:52 +01:00
Laurent Destailleur
db96634339
Fix trans
2020-03-02 18:50:21 +01:00
Laurent Destailleur
91e8df5c9b
Fix canonical name
2020-03-02 18:43:44 +01:00
Laurent Destailleur
390c0ce4dc
Fix main language is not into subdir
2020-03-02 18:41:30 +01:00
Laurent Destailleur
fab39aef9e
Clean menu bar
2020-03-02 17:35:49 +01:00
Laurent Destailleur
bb79c2cbd9
Fix links
2020-03-02 17:06:22 +01:00
Laurent Destailleur
dea1f1b19f
Fix link
2020-03-02 17:00:51 +01:00
Laurent Destailleur
8928a84c53
Fix link to medias
2020-03-02 16:56:54 +01:00
Tim Otte
d5671f1c42
Fixed a few bugs
2020-03-02 16:08:06 +01:00
Laurent Destailleur
c8b51066e5
NEW Add due date in feature "Export accounting documents"
2020-03-02 16:00:07 +01:00
florian HENRY
dbb80aecd1
Fix line origin and Id when create order from
2020-03-02 15:22:35 +01:00
Regis Houssin
e962afb9c5
FIX modFournisseur is required by modSupplierProposal
2020-03-02 14:10:37 +01:00
Tim Otte
598d6d63b0
Added HtmlToOdtConverter class
...
Implemented the converter in the odf setVars() function
2020-03-02 10:18:38 +01:00
Alexandre SPANGARO
cdca4ca0aa
NEW: Bookkeeping - Add link to document & pdf
2020-03-02 09:01:25 +01:00
Anthony Berton
5520df4e4f
Update list.php
2020-03-02 08:25:18 +01:00
Alexandre SPANGARO
be8ed42450
NEW: Bookkeeping - Add link to document & pdf
2020-03-01 23:17:40 +01:00
andreubisquerra
ba543896d4
Fix Terminal popup in new head barTakePOS
2020-03-01 21:19:48 +01:00
javierybar
a4b01e3025
Update invoice.php
2020-03-01 19:47:27 +01:00
javierybar
9fabc7de81
Update setup.php
2020-03-01 19:46:53 +01:00
javierybar
c9b6c89861
Update terminal.php
2020-03-01 19:46:21 +01:00
javierybar
e024ea2647
Update cashdesk.lang
2020-03-01 19:45:18 +01:00
ptibogxiv
844775501d
Update api_invoices.class.php
2020-03-01 18:46:12 +01:00
ptibogxiv
de30410adc
Update api_invoices.class.php
2020-03-01 18:43:20 +01:00
stickler-ci
b074c689a6
Fixing style errors.
2020-03-01 17:35:12 +00:00
ptibogxiv
6ee8fa4e8a
NEW: api invoice get by ref
2020-03-01 18:33:13 +01:00
Alex Ludwig
6ad477a08c
Resolve Error if dolibarr is running in docker container
...
If dolibarr is running in docker containers with alpine-linux it will fail because it has wrong environment variables. This pull request resolve the issue. It was found by dolichicken in the german user forum: https://www.dolibarr.de/forum/howto-hilfe/52509-anleitung-odt-nach-pdf-konvertieren#57583
2020-03-01 17:14:31 +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
Alexandre SPANGARO
da99c89c26
FIX: typo on ckeck method
2020-03-01 05:21:51 +01:00
Alexandre SPANGARO
6982997de5
Fix error
2020-03-01 05:09:57 +01:00
Alexandre SPANGARO
8f3401896f
Merge remote-tracking branch 'upstream/develop' into 12.0_a18
2020-03-01 05:06:52 +01:00
Alexandre SPANGARO
d9b9913e8a
NEW: Accountancy - Add mode intra & export for product or service bought
2020-03-01 04:52:12 +01:00
Laurent Destailleur
06e428064f
Fix CSS for md
2020-02-29 14:17:06 +01:00
Laurent Destailleur
786b13d09c
css
2020-02-29 13:51:24 +01:00
Laurent Destailleur
f2dba4f621
Merge pull request #13227 from aspangaro/12.0_a16
...
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
2020-02-29 13:02:43 +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
f0d2f33e38
Merge pull request #13231 from defrance/patch-148
...
FIX: checkbox fields not updated when unchecked
2020-02-29 12:54:25 +01:00
Laurent Destailleur
8879672122
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-29 12:52:18 +01:00
Laurent Destailleur
0855598c00
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/lib/functions.lib.php
2020-02-29 12:51:33 +01:00
Laurent Destailleur
c3ab1055bf
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-02-29 12:48:40 +01:00
VESSILLER
8eff3162a9
FIX undefined function measuringUnitString in product list
2020-02-29 12:47:48 +01:00
Laurent Destailleur
9def29054d
Fix compatibility account->bank_account
2020-02-29 12:46:52 +01:00
Laurent Destailleur
a6c7463c27
Merge pull request #13223 from TobiasSekan/FixCategoryStockCounter
...
Fix category stock counter
2020-02-29 12:38:21 +01:00
Laurent Destailleur
d6b5a84895
Merge pull request #13210 from atm-quentin/FIX_list_search_0
...
FIX search with '0'
2020-02-29 12:36:09 +01:00
Laurent Destailleur
52a92924de
Merge pull request #13230 from atm-gauthier/fix_round_accountancy
...
FIX : round MT in accountancy books
2020-02-29 12:35:33 +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
acb3fb2cd8
Fix extrafields on x-axis
2020-02-29 00:11:19 +01:00
Laurent Destailleur
c6b6b97ac0
FIX Free input for email no more visible
2020-02-28 20:25:17 +01:00
Laurent Destailleur
56704e4029
Add stats of products in MO
2020-02-28 19:26:52 +01:00
Laurent Destailleur
f5a07dfb7e
Add status into popup
2020-02-28 18:57:17 +01:00
Laurent Destailleur
6211577db7
Fix list of blog topics
2020-02-28 18:21:26 +01:00
Tobias Sekan
0e7e6f44e2
Update list.php
2020-02-28 16:16:05 +01:00
Tobias Sekan
a8728f9fcf
Update categorie.class.php
2020-02-28 16:14:50 +01:00
Laurent Destailleur
bfb9739ae8
Fix manufacuring efficiency on bom lines.
2020-02-28 16:12:42 +01:00
stickler-ci
948ac4b99a
Fixing style errors.
2020-02-28 15:10:44 +00:00
Tobias Sekan
bc8c709900
Add category filter for stocks
2020-02-28 16:03:35 +01:00
Tobias Sekan
f2fac96a2c
Add helper functions for categories
2020-02-28 16:00:23 +01:00
stickler-ci
89048ca52e
Fixing style errors.
2020-02-28 14:49:10 +00:00
BENKE Charlene
50b3c760dd
Update actions_addupdatedelete.inc.php
2020-02-28 15:47:26 +01:00
BENKE Charlene
477cce718b
checkbox not updated when unchecked
...
GETPOSTISSET return false in this case and the value is not updated
2020-02-28 15:29:12 +01:00
gauthier
284a4189b3
FIX : round MT in accountancy books
2020-02-28 14:32:35 +01:00
Laurent Destailleur
87b3cf9765
FIX Bad link to template invoices
2020-02-28 12:01:43 +01:00
Laurent Destailleur
9f5bde2131
css
2020-02-28 10:51:24 +01:00
Laurent Destailleur
932f91eb61
css
2020-02-27 23:11:39 +01:00
Laurent Destailleur
9c83dc0f1b
css
2020-02-27 23:03:39 +01:00
Laurent Destailleur
83957f93e6
Fix edit lang
2020-02-27 22:58:36 +01:00
Laurent Destailleur
e07a29ecd0
Fix class not found
2020-02-27 22:02:45 +01:00
Laurent Destailleur
2205667ca0
Fix multilang
2020-02-27 21:57:36 +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
b326d1fe49
Add link to wiki doc
2020-02-27 18:26:38 +01:00
Laurent Destailleur
1bc18931f8
Fix phpcs
2020-02-27 18:13:26 +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
Marc de Lima Lucio
5d1f91f8ac
FIX: muticurrency columns: remove useless column totals that mix currencies together
2020-02-27 17:37:36 +01:00
Marc de Lima Lucio
cdddccde16
NEW: propal list: enable multicurrency columns
2020-02-27 17:34:45 +01:00
Laurent Destailleur
f039008282
Fix reponsive
2020-02-27 16:33:24 +01:00
Laurent Destailleur
eac07aceb0
Responsive
2020-02-27 16:00:01 +01:00
Marc de Lima Lucio
341e4ae856
NEW: order list: enable multicurrency columns
2020-02-27 14:49:34 +01:00
Marc de Lima Lucio
6d728f12ba
NEW: invoice list: enable multicurrency columns
2020-02-27 14:10:00 +01:00
Alexandre SPANGARO
98db5232d1
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
2020-02-27 14:05:30 +01:00
Alexandre SPANGARO
a85dfaf71e
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
2020-02-27 12:09:19 +01:00
Alexandre SPANGARO
86d9622360
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
2020-02-27 10:44:04 +01:00
atm-quentin
009eb0d4a4
FIX test on 0 better than isset
2020-02-27 09:34:20 +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
Pierre Ardoin
8476477137
add const NOTMODIFYOTHERENTITYFOURNPRICE
...
if const NOTMODIFYOTHERENTITYFOURNPRICE, can't modify other shared fourn prices.
2020-02-27 09:19:39 +01:00
Pierre Ardoin
74ac69fc5a
Add Entity in list_product_fournisseur_price()
...
Select too the entity value to add const NOTMODIFYOTHERENTITYFOURNPRICE
2020-02-27 09:16:15 +01:00
Tobias Sekan
c60e7a4e60
Fix count errror on category view of stocks
2020-02-27 09:02:59 +01:00
Laurent Destailleur
957295ee2d
Fix look and feel v11
2020-02-27 01:12:53 +01:00
Laurent Destailleur
df87c77cd8
css
2020-02-27 01:02:55 +01:00
Laurent Destailleur
2cfc62d753
Update invoice.php
2020-02-27 00:11:13 +01:00
javierybar
3fa55a59b7
New TAKEPOS_NUMBERING_PREFIX const
2020-02-26 22:45:32 +01:00
