lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
83,228 Commits 43 Branches 150 Tags 886 MiB
679b94dcaa
Commit Graph

73127 Commits

Author SHA1 Message Date
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
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
1c7ce31207
Merge pull request #13435 from ptibogxiv/patch-316 
FIX product get purchase prices
 2020-03-30 19:20:32 +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
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
Francis Appels
3eda785ca5 Add newline end of file 2020-03-30 10:36:49 +02:00
Francis Appels
076caa11ab Add token functions to improve modulebuilder compatiblity with maintained versions. 2020-03-30 10:28:20 +02:00
Nicolas Bouquet
31fca2897a
FIX: extra date field incorrect check 
Small typo fixed, was preventing extra date fields from being processed, leading to denial of object creation
 2020-03-30 10:24:42 +02:00
Laurent Destailleur
9b2da5bdae FIX Missing token 2020-03-29 00:56:11 +01: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
4207d94f53 FIX Bad position of total in column 
Conflicts:
	htdocs/fourn/facture/paiement.php
 2020-03-27 19:10:01 +01:00
Laurent Destailleur
f512e0d161 Fix popup 2020-03-27 12:06:58 +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
atm-quentin
96481c3d52 FIX ordered stock already in $stock 2020-03-27 09:43:59 +01:00
Laurent Destailleur
9379f6fa9d Fix duplicate tooltip 2020-03-26 20:27:49 +01:00
Laurent Destailleur
4a012c13b2 FIX Translation of tooltips of extrafields 2020-03-26 19:47:28 +01:00
Laurent Destailleur
004397304e FIX Foreign currency lost when splitting a discount 2020-03-26 02:32:53 +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
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
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
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
925554d15e More accurate result 2020-03-25 18:27:53 +01:00
VESSILLER
c516a54f78 FIX get remain to pay with rounding decimals 2020-03-25 11:53:47 +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
Juanjo Menent
fec3377f24 FIX: Compatibility with multicompany, bad numerotation of task. 2020-03-24 18:49:16 +01:00
gauthier
4c0de74470 FIX : sort by default role makes no sense 2020-03-24 16:27:53 +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
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
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
Regis Houssin
45579b0986 FIX remove unused var, $usercancreate can be change by Multicompany 2020-03-23 07:01:23 +01:00
andreubisquerra
fbe6711353
Fix TakePOS DirectPayment when place is higher 0 2020-03-22 22:46:40 +01:00
Laurent Destailleur
94b6fbb223 FIX #13300 2020-03-22 20:52:00 +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
bcf17c79ef FIX closing tags 2020-03-22 02:44:00 +01:00
Laurent Destailleur
4ce1665a15 Fix charset in RSS export 2020-03-21 17:36:07 +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
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
d28eaf5824 FIX Backto link 2020-03-20 15:48:50 +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
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
7eb4522636 FIX missing token and save of survey description 2020-03-19 11:59:57 +01:00
Laurent Destailleur
8e1ffa5144 Fix management of token 2020-03-19 10:52:07 +01:00
Laurent Destailleur
d38c6616e6 Doc 2020-03-19 09:53:20 +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
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
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
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
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
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
Ferran Marcet
1fe4e4415e FIX: Bank movements color is not showing 2020-03-18 09:27:08 +01:00
ATM john
075757eb3d Fix situation value transmission 2020-03-17 16:49:05 +01:00
ATM john
cb43928a5d Fix radio label target 2020-03-17 12:29:14 +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
Laurent Destailleur
37fce0d3ee Fix position on merou 
Fix preselected value on contact
 2020-03-14 14:45:37 +01:00
Laurent Destailleur
8192e9dc67 FIX Missing token in form 2020-03-14 03:02:49 +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
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
4841a5bf4a Fix look and feel v11 2020-03-13 16:53:37 +01:00
florian HENRY
ca269864f7 let keep it to expedition 2020-03-13 14:55:34 +01:00
Laurent Destailleur
1ff102f62a Prepare 11.0.3 2020-03-13 10:31:28 +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
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
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
atm-lena
ca121dd689 FIX - Ticket - Load Cache Messages Ticket, wrong message's status 2020-03-12 16:21:11 +01:00
altairis
6618205e6f fix missing class declaration 2020-03-12 15:05:32 +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
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
dfe947885c FIX params of setEventMessage($langs->trans('ErrorProductClone')... 2020-03-12 12:40:28 +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
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
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
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
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
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
atm-lena
20aa51f26b FIX - Clone Fourn Command, add line's extrafields Part 2 2020-03-11 15:26:49 +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
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
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
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
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
99b1c773a7 FIX link when using anchor on "/" 2020-03-09 18:56:52 +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
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
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
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
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
adc996ee0a FIX #13194 2020-03-06 13:19:17 +01:00
Laurent Destailleur
5ff4b638a5 FIX empty of series in graph of product distribution 2020-03-06 12:00:40 +01:00
ATM-Nicolas
a9d7bbc2ed FIX : Remove unexisting link 2020-03-06 09:52:19 +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
fff7ee3e96 FIX #13285 SQL error during migration with pgsql 2020-03-06 01:55:36 +01:00
kamel
0123fa7696 FIX subsitute lines dates values on doc generator (ODT, ...) 2020-03-05 15:37:01 +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
a5a2d60755 Fix phpcs 2020-03-05 00:20:39 +01:00
Christian Foellmann
55dc3d36ac fix broken categories on "contacts" tab of project 2020-03-04 19:25:48 +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
ddc0547eda Fix position of button 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
f586c3b0c8 Prepare 11.0.2 2020-03-04 10:13:55 +01:00
Laurent Destailleur
24f416d0dd Fix default content of page 2020-03-04 02:03:29 +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