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

73175 Commits

Author SHA1 Message Date
atm-quentin
83f3c9ab6e use only 1 if 2020-04-10 12:09:18 +02:00
atm-quentin
28fa0e4e5d FIX missing selectedlines on supplier order but checkbox are displayed 2020-04-10 11:55:00 +02:00
andreubisquerra
4ac978303b
FIX TakePOS buying price 2020-04-10 08:36:16 +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
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
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
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
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
Francis Appels
0a8a8bafa0 FIX print pictures in shipment docs 2020-04-09 15:40:36 +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
gauthier
3327f1c074 FIX : IHM, unexpected quote 2020-04-09 11:53:03 +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
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
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
0716951b6d Fix logo 2020-04-08 13:38:29 +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
df81065f73 MAIN_VIEW_LINE_NUMBER_IN_LIST 2020-04-08 11:23:31 +02:00
Regis Houssin
34e434a17e FIX missing member entity 2020-04-06 16:36:11 +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
atm-quentin
9950295e41 FIX author search supplier proposal list 2020-04-06 10:29:04 +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
62387f712c FIX Send email from bulk action of list of thirdparties 2020-04-05 15:26:16 +02:00
Laurent Destailleur
bfbc9b303a Fix phpcs 2020-04-05 12:23:16 +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
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
165df931f1 Complete fix #13491 2020-04-05 03:14:12 +02:00
Laurent Destailleur
22a8c207f4
Merge pull request #13491 from atm-lena/11.0_FIX_Ticket_ExtrafieldsVisibility_4 
FIX 11.0 Ticket - Visibility 4, don't display extrafields at the creation
 2020-04-05 02:54:41 +02:00
Laurent Destailleur
2f1b25c67a Fix property not defined 2020-04-05 02:43:30 +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
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
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
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
Laurent Destailleur
71910b2181 Fix warning 2020-04-03 13:01:17 +02:00
Laurent Destailleur
193a10bc39 FIX cloning of emailing when no content selected 2020-04-03 02:29:10 +02:00
Laurent Destailleur
4c8a04cf38 Fix phpcs 2020-04-02 21:17:04 +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
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
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
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
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
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
70706d9ea7 FIX Missing token and take into account max date when it can. 2020-04-01 18:48:45 +02:00
Laurent Destailleur
6f0071bebe FIX sort on company on member list 2020-03-31 17:54:48 +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
florian HENRY
5658d783d6 fix advtargetemailing : fatal call to static attribut (that is not static: table_element) 2020-03-31 12:04:34 +02: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
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
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
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