lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
95,094 Commits 43 Branches 150 Tags 886 MiB
ae4fc565e1
Commit Graph

95094 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gauthier PC portable 024
ae6e1db652 FIX : getNomUrl() 2021-01-19 13:32:08 +01:00
Laurent Destailleur
2d8ca513d6 Fix param 'all' 2021-01-19 12:55:24 +01:00
UT from dolibit
7629961b50
Update ChangeLog 
moved to TAKEPOS:
NEW: delayed payment in TakePOS                                           ->  NEW: TakePOS add delayed payment
NEW: display date range if exist in TakePOS                              ->  NEW: TakePOS display date range if exist
NEW: display resiliate status in TakePOS for member                ->  NEW: TakePOS display resiliate status for members
 2021-01-19 12:44:13 +01:00
Laurent Destailleur
14ef211ed5
Merge pull request #15997 from bb2a/warehouse_on_thirparty 
NEW Add Warehouse affect on Thirparty
 2021-01-19 12:38:33 +01:00
Laurent Destailleur
8e357bf695
Update 13.0.0-14.0.0.sql 2021-01-19 12:37:48 +01:00
Laurent Destailleur
7472b102e4 Fix name of constraints 2021-01-19 12:32:37 +01:00
Laurent Destailleur
3033b1d5da
Update llx_societe.key.sql 2021-01-19 12:30:50 +01:00
Laurent Destailleur
67d9b38e45
No foreign key when field stored for a "defaut value" 2021-01-19 12:30:16 +01:00
stickler-ci
694f65082f Fixing style errors. 2021-01-19 11:25:45 +00:00
Laurent Destailleur
7cb8d5af55 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-19 12:25:28 +01:00
Laurent Destailleur
f54efca075 Clean code 2021-01-19 12:25:05 +01:00
Laurent Destailleur
d82765c6da
Update card.php 2021-01-19 12:15:56 +01:00
Laurent Destailleur
fe537fb2fc
Fix MVC 2021-01-19 12:14:54 +01:00
Gauthier PC portable 024
c1cd13aee3 Merge branch '12.0_new_payments_on_vat' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_vat_objects 2021-01-19 12:12:58 +01:00
Gauthier PC portable 024
c35a13bad0 FIX : set paid button display test 2021-01-19 12:12:05 +01:00
Gauthier PC portable 024
b2eca0a314 FIX : VAT declaration list + migration script 2021-01-19 12:02:05 +01:00
stickler-ci
0cdd9f8640 Fixing style errors. 2021-01-19 10:43:03 +00:00
zuiko
21fac1ff7a
Update mod_barcode_product_standard.php 
Fix #15633: Product creation: EAN13 barcode automatic generation incompatible with EAN13 existing barcode scanning, unusable function.
#15918 
ok with @eldy
Avoid  sql call if no joker at the end of mask
Treat EAN13 in a more evolutive code form to prepare needs for other barcodes with key
 2021-01-19 11:40:53 +01:00
Laurent Destailleur
01996261dc
Merge pull request #15985 from frederic34/codesyntax 
code syntax
 2021-01-19 11:29:18 +01:00
Laurent Destailleur
03d8c6bfd6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/paiement_charge.php
 2021-01-19 10:59:42 +01:00
Laurent Destailleur
934070f14e Backport FIx #15970 2021-01-19 10:56:46 +01:00
Laurent Destailleur
0c4d9c2e3a
Merge pull request #16004 from Hystepik/develop#2 
Fix #15970 user.class.php
 2021-01-19 10:54:24 +01:00
Laurent Destailleur
8cd8f21fde
Update user.class.php 2021-01-19 10:53:47 +01:00
Laurent Destailleur
7ad7ad9bb8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-19 10:43:31 +01:00
Laurent Destailleur
2c6d11e040 When creating invoice by mass action, message has link to invoice 2021-01-19 10:42:43 +01:00
lmarcouiller
afab5a977a dolgrap.class.php with frederic34 advices 2 2021-01-19 09:43:06 +01:00
lmarcouiller
73eee33f8a redo of pull request with sql updated 2021-01-19 09:24:15 +01:00
lmarcouiller
e9ac1e3443 Merge branch 'develop#2' of github.com:Hystepik/dolibarr into develop#2 2021-01-19 09:16:23 +01:00
lmarcouiller
00fb045e40 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2 2021-01-19 09:16:14 +01:00
lmarcouiller
d69e36c110 Merge branch 'develop#1' of github.com:Hystepik/dolibarr into develop#1 2021-01-19 09:11:29 +01:00
lmarcouiller
82b688a2b0 dolgrap.class.php with frederic34 advices 2021-01-19 09:10:15 +01:00
lmarcouiller
fd888be5e5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-01-19 09:05:08 +01:00
Gauthier PC portable 024
e2abbbcece Merge branch '12.0_new_payments_on_vat' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_vat_objects 2021-01-19 08:57:24 +01:00
Frédéric FRANCE
36eeef81bf
code syntax 2021-01-19 00:41:39 +01:00
Florian HENRY
3194bea832 Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0 2021-01-18 19:24:43 +01:00
Florian HENRY
a763d9c806 merge 2021-01-18 19:22:40 +01:00
Laurent Destailleur
6d251e6a43
Merge pull request #15963 from FHenry/13.0 
fix thirdparty list filter type_ent can be empty
 2021-01-18 19:21:58 +01:00
Laurent Destailleur
d69ce5b917
Merge pull request #15952 from FHenry/12_fix_autofill_date_payment 
12 fix autofill date payment
 2021-01-18 19:20:33 +01:00
Laurent Destailleur
ca7b644072
Merge pull request #16007 from dolibit-ut/patch-65 
Update dolibarr
 2021-01-18 19:19:46 +01:00
Laurent Destailleur
11adbb7b73
Merge pull request #16006 from hregis/fix_update_db_model 
FIX try to save again (no changes)
 2021-01-18 19:19:10 +01:00
lmarcouiller
21141f0788 Fix #16010 update fournisseur.product.class.php 2021-01-18 19:18:10 +01:00
Florian HENRY
a8cdecf1b8 better fix 2021-01-18 19:17:23 +01:00
Laurent Destailleur
0a422f44dc
Merge pull request #16011 from Hystepik/develop#3 
Fix #16010 update fournisseur.product.class.php
 2021-01-18 19:16:41 +01:00
David Bensel
9813cb430a FIX: type 'sellist' not handled properly in showInputField and showOutputField 2021-01-18 19:14:12 +01:00
Laurent Destailleur
a7dc9c6585
Merge pull request #16014 from davidNDU/develop 
# Fix: type 'sellist' not handled properly in showInputField and showOutputField
 2021-01-18 19:12:55 +01:00
Florian HENRY
6b61545189 Merge branch '12.0' of github.com:Dolibarr/dolibarr into 12_fix_autofill_date_payment 2021-01-18 19:07:30 +01:00
Laurent Destailleur
2baeec1537
Merge pull request #15964 from FHenry/12.0 
extrafeild selllist can be use with string fk
 2021-01-18 18:53:01 +01:00
Laurent Destailleur
bb752fa83d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/tpl/card_presend.tpl.php
 2021-01-18 18:50:57 +01:00
Laurent Destailleur
7195a6880f
Merge pull request #15992 from atm-kevin/FIX/GETPOST_param_card_presend 
FIX : missing GETPOST parameters on card_presend.tpl.php
 2021-01-18 18:49:28 +01:00
Laurent Destailleur
f76df625a9
Merge pull request #16009 from dolibit-ut/patch-67 
Update Links on GPL.txt
 2021-01-18 18:44:16 +01:00