Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-03-02 08:35:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,767 Commits 40 Branches 192 Tags
e3a0220658b7dfc05bfb499ace614fda170e4f3b
Commit Graph

5828 Commits

Author SHA1 Message Date
Laurent Destailleur
40ad12c3c3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-05 15:29:54 +02:00
Laurent Destailleur
efa302f865 Fix phpunit 2022-04-05 15:23:17 +02:00
Laurent Destailleur
7c591d95d9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-04-05 13:48:39 +02:00
Laurent Destailleur
d270a1a64b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-05 13:37:13 +02:00
Laurent Destailleur
f0433244aa Fix sql 2022-04-05 13:36:25 +02:00
atm-florian
b872fb2eac FIX 16.0 - missing quotes in SQL for frequency unit update for template supplier invoices 2022-04-05 12:28:40 +02:00
atm-florian
392ba6deed FIX 16.0 - my previous fix was incomplete (missing parentheses around OR-separated conditions) 
+ replace GETPOST('fac_rec', 'int') with variable
+ make sure it works even if, one day, the "nothing selected" value for the template supplier invoice selector changes to -1 instead of ''
 2022-04-05 12:16:06 +02:00
Gauthier PC portable 024
b199234afe FIX : each time we create a supplier order, we need to give it a ref_supplier 2022-04-05 12:01:09 +02:00
atm-florian
b929c2f671 FIX 16.0 - supplier invoice card creates two invoices instead of one when creating from a template 2022-04-05 11:46:06 +02:00
Laurent Destailleur
d514d72ac5 Doxygen 2022-04-03 12:35:30 +02:00
Laurent Destailleur
d3161f2c4e Clean code 2022-04-02 16:19:34 +02:00
Laurent Destailleur
7745203c16 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-02 16:17:04 +02:00
Laurent Destailleur
bb5cf1ed2e Merge pull request #20517 from ATM-Consulting/FIX_16.0_getNomUrl_for_supplier_invoice_templates 
FIX 16.0 - copy `title` over `ref` on FactureFournisseurRec object
 2022-04-02 16:16:55 +02:00
Laurent Destailleur
e2a957c738 Clean some trigger names 2022-04-02 16:08:04 +02:00
Laurent Destailleur
5b91ae062f All triggers with a name XXX_UPDATE have been renamed XXX_MODIFY for 
code consistency purpose.
 2022-04-02 10:31:58 +02:00
atm-florian
5a52650548 FIX: missing trigger DELETE for FactureRec, FactureFournisseurRec 
+ trigger name consistency ('UPDATE' -> 'MODIFY')
 + preparing future consistency mechanism with class constant
 2022-04-01 19:07:17 +02:00
atm-florian
d84af9fdcd FIX space-based indent (misconfigured IDE didn't take editorconfig into account) 
+ fix tab-based code alignment whitespace (≠indentation)
 2022-04-01 15:40:03 +02:00
atm-florian
560b8dc04c FIX 16.0 - copy title over ref on FactureFournisseurRec object 2022-04-01 15:26:06 +02:00
Laurent Destailleur
a51c868a8e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
 2022-04-01 14:40:50 +02:00
Laurent Destailleur
d0ee40e55d # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-04-01 14:39:10 +02:00
Laurent Destailleur
7b84b3e92d css 2022-03-31 13:27:14 +02:00
Laurent Destailleur
af4c0dcf6a Fix missing status on tooltip 2022-03-31 11:29:56 +02:00
Gauthier PC portable 024
684e816ac3 FIX : incrementation 2022-03-30 14:12:16 +02:00
ATM john
c1d9ea95dc fix function name 2022-03-30 12:16:17 +02:00
Gauthier PC portable 024
6480877b99 FIX : We need to have a different default_ref_supplier for each new fourn invoice 2022-03-30 10:01:17 +02:00
Gauthier PC portable 024
b7e7c95d2a FIX : ref_client doesn't exists on supplier invoice, then ref_fourn needs to have a default value when we want to bill several supplier orders 2022-03-29 16:02:39 +02:00
Laurent Destailleur
95dc25587c Standardize code of the fetch_lines() 2022-03-28 13:50:47 +02:00
Laurent Destailleur
78ee498151 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-26 16:13:54 +01:00
Laurent Destailleur
d75483552d Responsive 2022-03-26 15:48:36 +01:00
Laurent Destailleur
bc938d86ba NEW Can enter price with tax for predefined products on purchase objects 2022-03-26 11:22:54 +01:00
Laurent Destailleur
e8a9a7b732 Responsive 2022-03-26 10:02:20 +01:00
Marc de Lima Lucio
cbba7d7d5f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-25 16:14:53 +01:00
Laurent Destailleur
b9095fb10c Merge pull request #20425 from atm-GregM/DolGetButtonAction_Fourn 
FIX: replacing to dolGetButtonAction on Fourn card
 2022-03-25 15:08:42 +01:00
Laurent Destailleur
488b35d096 Merge pull request #20232 from hregis/fix_missing_advanced_perms 
FIX missing advanced perms
 2022-03-24 20:32:58 +01:00
Laurent Destailleur
08bc2a7ac0 Better modulebuilder design pattern 2022-03-24 19:27:42 +01:00
Laurent Destailleur
4a80f35aaa Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2022-03-23 17:26:25 +01:00
Regis Houssin
4ca3d45eca NEW add hook printFieldWhere in load_state_board function 2022-03-22 15:51:30 +01:00
Ferran Marcet
ccf8b01020 Fix: The origin of the stock movement is not being recorded 2022-03-22 13:46:55 +01:00
GregM
f24e1862ee replacing to dolGetButtonAction on Fourn card 2022-03-22 10:29:34 +01:00
Laurent Destailleur
8603d493ad Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/install/mysql/tables/llx_partnership.key.sql
 2022-03-19 17:34:26 +01:00
Laurent Destailleur
ed631b2b06 Fix doxygen, missing error message 2022-03-18 16:14:20 +01:00
Laurent Destailleur
167df9593b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/langs/en_US/products.lang
	htdocs/reception/class/reception.class.php
 2022-03-17 19:08:51 +01:00
Laurent Destailleur
e46ee982ec FIX Option to manage packaging. FIX size/length/volume of reception 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/langs/en_US/products.lang
	htdocs/reception/card.php
	htdocs/reception/class/reception.class.php
 2022-03-17 19:00:19 +01:00
Laurent Destailleur
5d415b183e FIX Option to manage packaging. FIX size/length/volume of reception 2022-03-17 18:53:50 +01:00
Laurent Destailleur
98cc40ac8d Fix a useless group by 2022-03-17 13:57:50 +01:00
Laurent Destailleur
7aeaaab7f0 Merge pull request #20365 from gdsoftdev/fix_invoicelineorders 
Fix : keep row order into invoices created from massactions
 2022-03-17 13:37:17 +01:00
Laurent Destailleur
079fcacf13 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/products.lang
 2022-03-17 00:16:14 +01:00
Sylvain Legrand
e97932301b DLC and DLUO are reversed in the called function 2022-03-16 22:15:49 +01:00
Jé GDSOFT
6080e1f988 fix : keep lines order when creating invoices from receptions 2022-03-15 14:59:26 +01:00
Regis Houssin
e59befa76b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into fix_missing_advanced_perms 2022-03-11 10:46:14 +01:00