lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
89,334 Commits 43 Branches 150 Tags 886 MiB
7ca9fd9dce
Commit Graph

89334 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
7ca9fd9dce Fix merge 2020-09-14 03:49:31 +02:00
Laurent Destailleur
dd06ff3a0d Label 2020-09-14 03:41:18 +02:00
Laurent Destailleur
419ac91a7a FIX #14538 2020-09-14 03:34:03 +02:00
Laurent Destailleur
78a999e6f3 css 2020-09-14 02:57:43 +02:00
Laurent Destailleur
bd8185fb49 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-14 02:49:35 +02:00
Laurent Destailleur
59bc8ee07c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/stats/byproperties.php
	htdocs/adherents/stats/geo.php
	htdocs/admin/system/dolibarr.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/tpl/objectline_title.tpl.php
	htdocs/langs/en_US/admin.lang
	htdocs/product/class/product.class.php
 2020-09-14 02:49:19 +02:00
Laurent Destailleur
701b83db38 FIX Bad number of subscription (forgotten when member was resiliated) 2020-09-14 02:38:12 +02:00
Laurent Destailleur
b2288ad2d9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-09-14 02:33:00 +02:00
Laurent Destailleur
a891211f78 Fix bad link 2020-09-14 02:32:30 +02:00
Laurent Destailleur
c40ec37b60 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-09-14 02:13:43 +02:00
Laurent Destailleur
c3ba8f7843 Better translation 2020-09-14 02:13:27 +02:00
Laurent Destailleur
3cb77d2e75
Merge pull request #14704 from aspangaro/13a12 
New Accountancy - Add default account for customer deposit
 2020-09-14 01:13:17 +02:00
Laurent Destailleur
dad02afa22
Update accountancy.lang 2020-09-14 01:13:07 +02:00
Laurent Destailleur
442fef207c Doc 2020-09-14 01:04:29 +02:00
Laurent Destailleur
970995d728 Clean code. Replace num_paiement with num_payment everywhere. 2020-09-14 01:03:51 +02:00
Laurent Destailleur
a2df666d34 Standardize code 2020-09-14 00:41:31 +02:00
Laurent Destailleur
62b7a90ea3
Merge pull request #14723 from c3do/patch-13 
NEW API Can update a payment
 2020-09-14 00:29:10 +02:00
Laurent Destailleur
e9d0869383
Update api_invoices.class.php 2020-09-14 00:28:43 +02:00
Laurent Destailleur
dcdce246b1
Update api_invoices.class.php 2020-09-14 00:26:16 +02:00
Laurent Destailleur
cdf071ea10
Merge pull request #14717 from bafbes/abb120142 
allow external users to see thirdparties with printFieldListWhere hook.
 2020-09-14 00:23:26 +02:00
Laurent Destailleur
26b4fb3e68
Update list.php 2020-09-14 00:22:58 +02:00
Laurent Destailleur
1015d3c026
Merge pull request #14716 from 99Deon/develop 
fix bug  in "llx_c_ticket_category.sql"  table .
 2020-09-14 00:17:16 +02:00
Laurent Destailleur
18b20a5587
Merge pull request #14721 from indelog/12.0 
Fix: getLabelOfUnit() for Product, CommonObjectline to print long label
 2020-09-14 00:16:38 +02:00
Laurent Destailleur
d0698735d6
Update product.class.php 2020-09-14 00:14:25 +02:00
Laurent Destailleur
0d9d9498e2
Update commonobjectline.class.php 2020-09-14 00:13:12 +02:00
Laurent Destailleur
7b13730a84
Merge pull request #14718 from c3do/patch-12 
NEW ref_ext for llx_paiement
 2020-09-14 00:07:39 +02:00
Laurent Destailleur
e941212ab9
Merge pull request #14725 from andreubisquerra/master 
NEW Weighing Scale compatibility with TakePOS
 2020-09-14 00:05:56 +02:00
Laurent Destailleur
a4fb16b4f3 Add a warning to warn about security leak 2020-09-14 00:03:49 +02:00
jove@bisquerra.com
e55c16c039 NEW Weighing Scale compatibility with TakePOS connector 2020-09-13 21:12:14 +02:00
Laurent Destailleur
3585d3d52f css 2020-09-13 15:21:45 +02:00
stickler-ci
8d3bc3ee6f Fixing style errors. 2020-09-13 13:18:42 +00:00
Cédric
929804f4d2
Update api_invoices.class.php 2020-09-13 15:12:22 +02:00
Laurent Destailleur
f9af7bc114 Fix phpcs 2020-09-13 14:42:56 +02:00
Laurent Destailleur
76fc8330a3 Fix for wampserver3_64 
Conflicts:
	build/exe/doliwamp/doliwamp.iss
 2020-09-13 13:47:46 +02:00
Laurent Destailleur
ca4716dfb7 Fix for wampserver3_64 2020-09-13 13:45:28 +02:00
Laurent Destailleur
5e2494a82c Update doc 2020-09-13 13:17:21 +02:00
Laurent Destailleur
3aff66bc89 Doc 2020-09-13 13:08:28 +02:00
Laurent Destailleur
8a561c644f Doc 2020-09-13 13:03:33 +02:00
DEMAREST Maxime (Indelog)
1c523abbd8 Fix: getLabelOfUnit() for Product, CommonObjectline to print long label 
Also add $type = 'code' for return unit code in form 'unitXX' (where XX
is the code of unit).

for get return like unitXX where XX is the code of unit
 2020-09-13 07:44:30 +02:00
stickler-ci
2cfe740d85 Fixing style errors. 2020-09-12 17:08:44 +00:00
Cédric
acc995a553
Update commoninvoice.class.php 2020-09-12 19:05:33 +02:00
Cédric
29931bbded
Update 12.0.0-13.0.0.sql 2020-09-12 18:55:26 +02:00
Cédric
1f5419c883
Update llx_paiement.sql 2020-09-12 18:53:02 +02:00
Cédric
d728d268ca
Update paiement.class.php 2020-09-12 18:49:52 +02:00
bahfir abbes
ef0b84a507 allow external users to see thirdparties with printFieldListWhere hook; 2020-09-12 16:40:18 +01:00
chkernit
7252022afe
fix problem in table "llx_c_ticket_category.sql" 
when install dolibarr project  the step of creation tables does not completed because there are a bug in create llx_c_ticket_category.sql table .
 2020-09-12 16:33:07 +01:00
Laurent Destailleur
48e34c2069 Add int 2020-09-12 15:53:18 +02:00
Laurent Destailleur
7d25de5713 Enhance setup page for email setup 2020-09-12 15:39:14 +02:00
Laurent Destailleur
1f8278c8ca Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/core/class/html.formmail.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/langs/en_US/other.lang
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-09-12 04:42:59 +02:00
Laurent Destailleur
5ea3f09e17 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/translate.class.php
 2020-09-12 04:29:28 +02:00