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

90735 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
c05b96f58e
Merge pull request #15099 from joseplluis/patch-10 
NEW form to add customer/supplier into categories
 2020-10-22 18:33:29 +02:00
Laurent Destailleur
a6484e933b Css 2020-10-22 18:28:47 +02:00
Laurent Destailleur
fb7202b7f8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-22 17:55:47 +02:00
Laurent Destailleur
0616b9bc9b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/card.php
	htdocs/compta/prelevement/line.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/functions2.lib.php
	htdocs/core/tpl/card_presend.tpl.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2020-10-22 17:55:38 +02:00
Laurent Destailleur
a17c391efe Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/product/composition/card.php
 2020-10-22 17:38:48 +02:00
Laurent Destailleur
cfcac7e053 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/lib/functions2.lib.php
 2020-10-22 17:34:48 +02:00
Laurent Destailleur
a826e328c1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-10-22 17:31:40 +02:00
Laurent Destailleur
31f1ab73b1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-10-22 17:31:29 +02:00
Laurent Destailleur
f04dc4de15
Merge pull request #15050 from frederic34/patch-4 
Fix upload photo
 2020-10-22 17:24:06 +02:00
Laurent Destailleur
30d39f890c
Merge pull request #15054 from ptibogxiv/patch-387 
NEW display date range if exist in takepos
 2020-10-22 17:16:46 +02:00
Laurent Destailleur
7816e5d757
Merge pull request #15055 from ptibogxiv/patch-388 
NEW add alert before change thirdparty in takepos
 2020-10-22 17:16:19 +02:00
Laurent Destailleur
0bb6c8dda9
Merge pull request #15100 from grandoc/new_branch_22_10_2020 
fix : deprecated
 2020-10-22 16:59:22 +02:00
Laurent Destailleur
72505b2ad4
Merge pull request #15101 from FHenry/12.0_fix_autofilldate_payment_expensereport 
fix MAIN_AUTOFILL_DATE for expense payment date
 2020-10-22 16:58:55 +02:00
Philippe GRAND
a2b3dbd8f8 fix : deprecated 2020-10-22 16:47:35 +02:00
Philippe GRAND
dc0d9e46b8 fix : deprecated 2020-10-22 16:46:45 +02:00
Philippe GRAND
74fc38395c fix : deprecated 2020-10-22 16:44:26 +02:00
Philippe GRAND
e0639209a7 fix : deprecated 2020-10-22 16:43:35 +02:00
Philippe GRAND
0fc054a624 fix : deprecated 2020-10-22 16:43:02 +02:00
Philippe GRAND
3ee7cfc1b7 fix : deprecated 2020-10-22 16:42:32 +02:00
Philippe GRAND
a8b25e32f0 fix : deprecated 2020-10-22 16:40:58 +02:00
Philippe GRAND
d5e456fd36 fix : deprecated 2020-10-22 16:40:03 +02:00
Philippe GRAND
3854808d21 fix : deprecated 2020-10-22 16:39:21 +02:00
Florian HENRY
10a3786bab fix MAIN_AUTOFILL_DATE for expense payment date 2020-10-22 16:38:59 +02:00
Philippe GRAND
9dc93b0e29 fix : deprecated 2020-10-22 16:38:43 +02:00
Philippe GRAND
52b602b1ce fix : deprecated 2020-10-22 16:38:02 +02:00
Philippe GRAND
9260eed12a fix : deprecated 2020-10-22 16:37:06 +02:00
Philippe GRAND
1319765a4f fix : deprecated 2020-10-22 16:35:47 +02:00
Laurent Destailleur
c8936f9919
Merge pull request #15094 from marc-dll/FIX_10.0_virtual_product_buying_price 
FIX: virtual products: supplier discount was not applied in component list
 2020-10-22 16:34:57 +02:00
Laurent Destailleur
3369379ba1
Update card.php 2020-10-22 16:34:23 +02:00
Philippe GRAND
1ca6068a41 fix : deprecated 2020-10-22 16:34:12 +02:00
Philippe GRAND
fae572d43a fix : deprecated 2020-10-22 16:29:17 +02:00
Laurent Destailleur
ec2a91471e
Merge pull request #15096 from dvasseur/patch-1 
NEW Allow to edit "demand reason" field though API
 2020-10-22 16:19:11 +02:00
Marc de Lima Lucio
34dd486b6c FIX: virtual products: displayed value is by unit 2020-10-22 16:18:37 +02:00
Laurent Destailleur
0f435f9901
Merge pull request #15098 from atm-gauthier/9.0_fix_worklow_order_auto_validated_with_shipping_validate_must_no_consider_services 
FIX : WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING must not consider serv…
 2020-10-22 16:18:11 +02:00
Laurent Destailleur
a9117fe864
Update interface_20_modWorkflow_WorkflowManager.class.php 2020-10-22 16:18:00 +02:00
Laurent Destailleur
fec8e5a0b8
Merge pull request #15022 from bafbes/abb120350 
new:handle new type reference in add and update actions
 2020-10-22 16:16:52 +02:00
Laurent Destailleur
81bfbbac26
Update actions_addupdatedelete.inc.php 2020-10-22 16:16:37 +02:00
Laurent Destailleur
0c3f8d2daa
Update actions_addupdatedelete.inc.php 2020-10-22 16:16:14 +02:00
stickler-ci
b5c2c6b755 Fixing style errors. 2020-10-22 14:15:16 +00:00
Laurent Destailleur
b88a9fc94d
Update actions_addupdatedelete.inc.php 2020-10-22 16:15:11 +02:00
Laurent Destailleur
2702bd023f
Merge pull request #15059 from frederic34/patch-6 
Add ref instead id in bank check remittance
 2020-10-22 16:12:31 +02:00
Josep Lluís
31ae2f2a21
NEW form to add customer/supplier into categories 
Form to add customers and suppliers into categories, as in products
 2020-10-22 16:12:01 +02:00
Laurent Destailleur
c09e71962e
Merge pull request #15060 from grandoc/new_branch_19_10_2020 
fix : Warning: A non-numeric value encountered in /home/httpd/vhosts/…
 2020-10-22 16:11:47 +02:00
Laurent Destailleur
9c9d468a18
Merge pull request #15052 from andreubisquerra/master 
TakePOS connector compatibility with templates
 2020-10-22 16:11:16 +02:00
Laurent Destailleur
8ce929d509
Merge pull request #15069 from ATM-Consulting/fix/9.0_linked_object_on_supplier_proposal_events 
FIX 9.0 - when users create an event from a supplier proposal, the "linked objects" section says "Deleted"
 2020-10-22 16:10:49 +02:00
Got2be
c2ad40043f FIX : WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING must not consider services while STOCK_SUPPORTS_SERVICES is empty 2020-10-22 16:10:47 +02:00
Laurent Destailleur
db06dc54a5
Merge pull request #15061 from hregis/develop_bug2 
FIX wrong object name
 2020-10-22 16:10:15 +02:00
Laurent Destailleur
648efbc0cb
Merge pull request #15067 from prietojc/12.0 
FIX: Payment by BankTransfer
 2020-10-22 15:59:19 +02:00
Laurent Destailleur
ca93f732c8
Update line.php 2020-10-22 15:59:04 +02:00
Laurent Destailleur
b9e6b188bc
Update rejetprelevement.class.php 2020-10-22 15:58:24 +02:00