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

1931 Commits

Author SHA1 Message Date
Alexandre SPANGARO
ce7c5a0c7b Work on split module fournisseur 2021-04-11 04:24:21 +02:00
Laurent Destailleur
12e847ade1 Fix color of reports. Fix include_once into include. 2021-04-06 22:18:32 +02:00
Laurent Destailleur
5c2ee240b2 FIX #yogosha5752 2021-03-29 15:59:37 +02:00
Laurent Destailleur
ce1f8289a4 FIX #yogosha5746 2021-03-29 15:07:23 +02:00
Laurent Destailleur
b929641fe1 Look and feel v14 2021-03-29 13:00:17 +02:00
Laurent Destailleur
01c1101b29 Look and feel v14 2021-03-26 18:16:12 +01:00
Laurent Destailleur
a5034d44f7 $_POST war 2021-03-24 19:53:31 +01:00
Laurent Destailleur
e366d2c379 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/admin/tools/export_files.php
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/cron/list.php
	htdocs/filefunc.inc.php
	test/phpunit/FilesLibTest.php
 2021-03-16 14:57:04 +01:00
Laurent Destailleur
39849de96e Look and feel v14 2021-03-16 10:19:56 +01:00
Juanjo Menent
76cf3da449 FIX: Cannot delete a batch material from item receipts 2021-03-15 18:10:59 +01:00
Christophe Battarel
faf7b1d659 adapt dispatch for serial numbers 2021-03-04 15:31:51 +01:00
Laurent Destailleur
f11a85a3e3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/compta/facture/card.php
	htdocs/contrat/card.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/supplier_proposal/card.php
 2021-03-03 11:37:34 +01:00
Laurent Destailleur
7eb3e324c7 FIX #16503 2021-03-02 23:09:55 +01:00
Laurent Destailleur
42329b10c9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	build/generate_filelist_xml.php
	htdocs/comm/propal/card.php
	htdocs/commande/card.php
	htdocs/compta/facture/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/modulebuilder.lib.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/supplier_proposal/card.php
	htdocs/ticket/list.php
 2021-03-02 15:27:20 +01:00
Laurent Destailleur
cffea1889f FIX #16325 2021-03-02 01:17:28 +01:00
Frédéric FRANCE
ed6d2376f1
code syntax fourn directory 2021-02-25 23:21:30 +01:00
Alexandre SPANGARO
ddea3f8a92 Code enhanced - Standardize field name #14697 2021-02-21 21:47:26 +01:00
Laurent Destailleur
2be6992916 Fix include_once into include for inc.php file. See comment in #16338 2021-02-19 16:10:19 +01:00
Laurent Destailleur
d16276ea2c Clean code 2021-02-16 11:15:42 +01:00
Laurent Destailleur
026259ebd7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ajax.lib.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/product/fournisseurs.php
 2021-02-15 13:12:27 +01:00
Laurent Destailleur
408aefd46c FIX vat value when code contains number 2021-02-10 01:10:31 +01:00
Laurent Destailleur
d588086c47 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-09 21:21:28 +01:00
Laurent Destailleur
e1af57f540 FIX status late on purchase orders 2021-02-09 20:46:17 +01:00
Laurent Destailleur
8041ef641a
Merge branch 'develop' into dev_typent_jax_workcorrectly 2021-02-08 15:29:36 +01:00
Frédéric FRANCE
8d49ca9f0d
fix html 2021-02-07 18:49:46 +01:00
Florian HENRY
ec41bf58e5 always ajax now 2021-02-04 09:48:17 +01:00
Laurent Destailleur
7887d4cc8e Fix price2num on all GETPOST('remise_percent') 2021-01-31 12:48:40 +01:00
Laurent Destailleur
b24aac1e6b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
 2021-01-31 12:03:39 +01:00
Laurent Destailleur
044b4eee48 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/expedition/list.php
 2021-01-31 11:54:45 +01:00
Laurent Destailleur
244ee05a9c FIX #14290 #15900 2021-01-30 18:09:13 +01:00
Laurent Destailleur
9ec5ba46fb Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2021-01-28 14:47:06 +01:00
Laurent Destailleur
d3c94a0edb Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/fourn/commande/dispatch.php
 2021-01-28 14:21:48 +01:00
Laurent Destailleur
d637bbd7e9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-28 14:14:03 +01:00
Laurent Destailleur
c63a124d1c More complete fix 2021-01-28 14:13:29 +01:00
Juanjo Menent
2f98d8035c Fix: Bad supplier price updater 2021-01-28 13:37:43 +01:00
Laurent Destailleur
2c6d11e040 When creating invoice by mass action, message has link to invoice 2021-01-19 10:42:43 +01:00
Laurent Destailleur
828f1c8314 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
 2021-01-15 14:04:22 +01:00
Laurent Destailleur
cac7fdd058 Look and feel v13 2021-01-15 14:02:18 +01:00
Laurent Destailleur
5bd59cd6d1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-11 13:37:59 +01:00
Laurent Destailleur
8debb58f7c Fix rounding of currency unit prices 2021-01-11 13:36:53 +01:00
Laurent Destailleur
16253a79ee FIX GETPOST of qty with wrong parameters 
Conflicts:
	htdocs/bom/bom_card.php
 2021-01-11 13:11:40 +01:00
Laurent Destailleur
f3e28c2dd0 FIX GETPOST of qty with wrong parameters 2021-01-11 13:00:29 +01:00
Laurent Destailleur
26fa8b45ac
Merge pull request #15153 from FHenry/dev_new_add_desc_when_select_product 
NEW: preload product description on selection for customer propal/order/invoice
 2021-01-07 11:19:53 +01:00
Laurent Destailleur
ed25b252b9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-05 11:30:14 +01:00
Laurent Destailleur
5e92ed0dcd Fix load lang 2021-01-05 10:44:28 +01:00
Florian HENRY
dfaf77b03f merge develop 2021-01-03 15:14:34 +01:00
Laurent Destailleur
1ab459e854 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-02 16:19:08 +01:00
Laurent Destailleur
ce0abd17fe Debug v13 2021-01-02 16:18:16 +01:00
Laurent Destailleur
a6eb14f68b
Merge pull request #15585 from cfoellmann/fckeditor-notes 
NEW Can toggle FCKeditor on public/private notes
 2020-12-27 15:06:35 +01:00
Laurent Destailleur
d65dc85a10 FIX for php 8 2020-12-23 19:16:25 +01:00
Laurent Destailleur
8e839a34e2 FIX for php 8 2020-12-23 19:14:47 +01:00
Laurent Destailleur
a67068ab7b Fix warnings 2020-12-17 18:08:56 +01:00
Laurent Destailleur
10bef6eb03 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/opensurvey/class/opensurveysondage.class.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/card.php
 2020-12-04 19:24:29 +01:00
Laurent Destailleur
1ff55100d4 Fix use combobox for warehousr selection 2020-12-03 19:13:40 +01:00
Laurent Destailleur
df48704154 Fix label 2020-12-03 18:45:56 +01:00
Laurent Destailleur
e689df8359 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/list.php
	htdocs/takepos/invoice.php
	htdocs/user/list.php
 2020-12-01 10:04:51 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-12-01 01:41:19 +00:00
Christian Foellmann
f801dd7d66 PR toggle FCKeditor on public/private notes 2020-11-30 16:39:14 +01:00
Laurent Destailleur
958893228a Fix combo to add contact and status of contact on popup 2020-11-30 15:18:58 +01:00
Laurent Destailleur
4f762cf73d Fix label 2020-11-30 08:29:19 +01:00
Laurent Destailleur
250b42f60a Fix phpcs 2020-11-27 00:37:36 +01:00
Laurent Destailleur
82da0d01f1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formorder.class.php
	htdocs/fourn/commande/list.php
 2020-11-26 18:52:00 +01:00
Laurent Destailleur
b043442b91 Fix link and selection of status of purchase order. 2020-11-26 17:53:57 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel" 
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
 2020-11-23 15:12:52 +01:00
Givriz
c48129e279 Ajout de la class "button-save" 
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
 2020-11-19 20:23:38 +01:00
Florian HENRY
46326d7659 merge from develop 2020-11-19 13:53:34 +01:00
Laurent Destailleur
6c42535eb2 Maxi debug v13 2020-11-16 12:20:18 +01:00
Laurent Destailleur
cbe9fec51d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/ticket/list.php
 2020-11-15 17:29:19 +01:00
BlueGarm
2425cf82d3 Add Partially Received Order and Delay 
Edit file to allow following order received partially and to upgrade lisibility of delayed orders
 2020-11-14 13:25:02 +01:00
Laurent Destailleur
90884d8085 Fix compatibility with date_delivery 2020-11-11 18:08:40 +01:00
Laurent Destailleur
da6c6c9e0a Clean code 2020-11-08 14:39:20 +01:00
Rüdiger Hahn
f173c0f82a
Fix: Keep status filter when using pager 
"search_status" was correctly set before and overwritten/cleared in this line.
 2020-11-04 18:54:48 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Florian HENRY
d77a0b40a8 tested and approuve feaure #15036 2020-10-28 16:37:41 +01:00
Florian HENRY
a3073be8e4 Merge github.com:Dolibarr/dolibarr into dev_new_add_desc_when_select_product 2020-10-28 08:52:29 +01:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Francis Appels
7fa7f0a390 Re-add set_date_livraison as a deprecated function. 
Use correct naming convention for new method naming.
 2020-10-26 16:50:52 +01:00
Florian HENRY
76824c868b clean get price for fourn and labal for supplier coducment 2020-10-26 16:31:07 +01:00
Laurent Destailleur
cd4d738a56 Merge branch 'translateModLivraison2ModDelivery' of 
https://github.com/orebd/dolibarr into develop

# Conflicts:
#	htdocs/install/mysql/migration/12.0.0-13.0.0.sql
 2020-10-25 16:01:18 +01:00
Frédéric FRANCE
9a470fa42d
replace deprecated 2020-10-22 22:50:03 +02:00
Frédéric FRANCE
7d8df07253
Update card.php 2020-10-22 11:46:12 +02:00
Laurent Destailleur
7504f92a41 Standardize code and look and feel 2020-10-16 13:30:20 +02:00
Laurent Destailleur
042a9f3efe Fix missing newtoken() 2020-10-12 19:39:54 +02:00
Florian HENRY
29bf3d0439 Merge github.com:Dolibarr/dolibarr into develop 2020-10-09 12:20:29 +02:00
Florian HENRY
bbdf304f1e fix 2020-10-09 12:20:20 +02:00
Aurélien
b6283c1a5d
Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery 2020-10-08 16:19:10 +02:00
Laurent Destailleur
415840e346
Merge pull request #14952 from TobiasSekan/AllowZeroQualityOnSupplierOrderLines 
NEW Allow zero quality on supplier/vendor order line
 2020-10-07 15:07:53 +02:00
Scrutinizer Auto-Fixer
1512521d91 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-07 13:01:28 +00:00
Sekan, Tobias
3f39766064 Allow zero quality on supplier order line 2020-10-07 13:10:04 +02:00
Florian HENRY
36353f7c9b Merge github.com:Dolibarr/dolibarr into develop 2020-10-07 12:04:18 +02:00
AurelienBinard
39d538befc
Merge branch 'develop' into translateModLivraison2ModDelivery 2020-10-06 16:20:25 +02:00
Laurent Destailleur
e3542c6d4f
Merge pull request #14848 from TobiasSekan/ShowCategoryInListOnlyWithRights 
NEW Show category filter on lists only when user have rights to read categories
 2020-10-06 12:29:10 +02:00
Aurélien
5571a166c6
change variable #14697 2020-10-06 11:37:55 +02:00
Florian HENRY
4e711d4e30 fix bad test syntax 2020-10-05 15:15:15 +02:00
Laurent Destailleur
331f751905
Merge pull request #14866 from defrance/patch-156 
NEW add two hooks printFieldListFrom and printFieldSearchParam
 2020-10-02 15:01:12 +02:00
Laurent Destailleur
31710479dc
Update list.php 2020-10-02 14:59:18 +02:00
Laurent Destailleur
399258cc86
Update list.php 2020-10-02 14:55:02 +02:00
Laurent Destailleur
10deb1baad Clean code - Removed no more used files orderstoinvoice.php 2020-10-02 13:51:32 +02:00
Laurent Destailleur
d912908aef NEW Can build vendor invoice from vendor orders 2020-10-01 19:05:20 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
BENKE Charlene
10f8ccd7ed
New : add two hook for more feature on list 
New hook are : 
printFieldListTable : allow to add more table on sql query (from another modules)
printFieldListSearchParam : allow to keep search on new filter

If ok, i add it on all native list
 2020-09-30 10:55:55 +02:00
Sekan, Tobias
2bf15b3a92 Show category filter only on rights to read it 2020-09-28 10:42:49 +02:00
Tobias Sekan
a72519f353
Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-23 09:09:42 +02:00
Laurent Destailleur
b2f8c4c6b8 Escape output 2020-09-20 19:21:04 +02:00
Laurent Destailleur
f57b4fd2fd Fix escaping 2020-09-20 02:30:53 +02:00
Laurent Destailleur
7c50cc9c72 css 2020-09-19 15:17:50 +02:00
Laurent Destailleur
3bd94d52a1 Fix css 2020-09-19 15:15:49 +02:00
Laurent Destailleur
4e2aff2cdc Fix sql injection when forging requests with IN 2020-09-18 17:28:02 +02:00
Tobias Sekan
b2a953ed5b
Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-18 12:21:41 +02:00
Sekan, Tobias
ae8c302c19 merge variable declaration 2020-09-18 10:52:17 +02:00
Sekan, Tobias
dc4250aed7 Make button visiblity identical on most lists 2020-09-18 10:46:23 +02:00
Sekan, Tobias
d1f70a37df Preselect thirparty on new from list (part 1) 2020-09-18 07:56:13 +02:00
Laurent Destailleur
c4b5f5a249 Maxi clean of code 2020-09-18 01:29:17 +02:00
Laurent Destailleur
bfbb217607 Fix GETPOST on 'action' 2020-09-16 19:39:50 +02:00
Christian Foellmann
c869f8fe5f fix for broken table on dispatch when hiding sellby/eatby dates 2020-09-15 14:19:02 +02:00
Laurent Destailleur
b8fe2188a6 Standardize code around model_pdf 2020-09-10 01:49:09 +02:00
Scrutinizer Auto-Fixer
c263c8a76c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-08 19:27:28 +00:00
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-07 08:18:17 +00:00
Laurent Destailleur
ef0c9df5ff
Merge pull request #14224 from cfoellmann/disable-eatby-sellby 
NEW Can hide eatby, sellby dates with option PRODUCT_DISABLE_SELLBY and PRODUCT_DISABLE_EATBY
 2020-09-04 12:09:30 +02:00
Laurent Destailleur
ad87e753b4 Clean trim on GETPOST (already included inside GETPOST when not 'none' 2020-08-28 21:27:50 +02:00
Laurent Destailleur
4ecd15b7ab Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/main.lang
 2020-08-27 21:57:42 +02:00
Laurent Destailleur
243f59b9e9 FIX Missing transaction on PO actions 2020-08-26 17:09:45 +02:00
Laurent Destailleur
05d82a0684 FIX Error management. Do no try to approve PO if validation fails. 2020-08-24 17:07:30 +02:00
stickler-ci
8191447007 Fixing style errors. 2020-08-19 16:33:41 +02:00
Christian Foellmann
b6af4014de hide eatby, sellby dates 2020-08-19 16:33:41 +02:00
Laurent Destailleur
4c1aa25b32 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/admin/adherent_emails.php
	htdocs/core/tpl/extrafields_list_search_title.tpl.php
	htdocs/product/traduction.php
 2020-08-04 13:51:11 +02:00
Laurent Destailleur
30560397e4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/class/commondocgenerator.class.php
 2020-08-04 13:43:00 +02:00
Laurent Destailleur
2076d18825 FIX Param of fetch_name_optionals_label must be object->table_element 2020-08-04 12:47:09 +02:00
Laurent Destailleur
4bacb7d48e
Update dispatch.php 2020-08-04 12:00:24 +02:00
Laurent Destailleur
fd551261bb
Update dispatch.php 2020-08-04 11:58:29 +02:00
Laurent Destailleur
dbb2e8b1ba
Update dispatch.php 2020-08-04 11:56:01 +02:00
Bahfir Abbes
8dd54e24e7
empty is more useful than 0 2020-08-03 20:42:25 +01:00
bahfir abbes
4900e85fa8 fix: reset link on supplier dispatch 2020-08-03 20:31:55 +01:00
quentin
bbfca90260 FIX Missing PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE conf in supplier order 2020-08-03 11:54:26 +02:00
bahfir abbes
6d3cebfa3c fix:erroneous input id name 2020-08-01 12:54:42 +01:00
Romain DESCHAMPS
eaef99b7af second approval back in stable feature as is the setting for minimum amount 2020-07-29 13:39:38 +02:00
Romain DESCHAMPS
09bf8bea85
second approval back in stable feature as is the setting for minimum amount 2020-07-24 14:11:42 +02:00
stickler-ci
28bc001ba9 Fixing style errors. 2020-07-17 08:52:52 +00:00
Ferran Marcet
125be4271e New: ##12972 Update supplier price also when product has batch 2020-07-17 10:50:24 +02:00
Laurent Destailleur
4627f06c70 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-16 22:57:50 +02:00
Laurent Destailleur
cbd99ea7a2 FIX #14088 2020-06-16 21:57:49 +02:00
Laurent Destailleur
ba1e067d32
Merge pull request #13678 from TobiasSekan/cleanupUserRightsForunCommandeCard 
Cleanup user rights forun commande card
 2020-05-28 21:12:23 +02:00
Frédéric FRANCE
e5402988d9
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-24 17:58:18 +02:00
Laurent Destailleur
fd61214b97 Merge 2020-05-24 01:06:45 +02:00
Frédéric FRANCE
174ddc5fd4
prepare new rule 2020-05-23 21:07:47 +02:00
Laurent Destailleur
40777cbcd9 Fix phpcs 2020-05-23 20:11:10 +02:00
Laurent Destailleur
127534ef55 Fix common var name seems to be $objref for subdir of doc 2020-05-23 20:09:31 +02:00
stickler-ci
66637ba0b6 Fixing style errors. 2020-05-23 16:39:06 +00:00
Frédéric FRANCE
2085ac73e7
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:34:58 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
f5688b2eec
add new rule 2020-05-21 01:52:25 +02:00
altairis
80c56b3017 manage stock on edit and delete dispatched lines 2020-05-19 15:59:03 +02:00
altairis
b79a30c0f9 edit and delete dispatched lines 2020-05-19 14:18:06 +02:00
Pierre Ardoin
c0b9fef229
Fix issue in status name 
Before : $commandestatic->LibStatut($obj->nb) shows bad value because bad param

Now : $commandestatic->LibStatut($obj->fk_statut) shows good value.
 2020-05-05 08:40:30 +02:00
Laurent Destailleur
1121d2c1c6 Look and feel v12 2020-04-25 13:49:44 +02:00
Laurent Destailleur
86be024dcc Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modFournisseur.class.php
 2020-04-23 17:17:42 +02:00
Laurent Destailleur
72c6ac1c72 Complete #13708, normalization of code 2020-04-23 13:21:39 +02:00
Laurent Destailleur
e1129babbc Code comment 2020-04-23 12:44:30 +02:00
Laurent Destailleur
93278b2dca FIX #13713 2020-04-23 12:42:03 +02:00
Sekan, Tobias
7de4f4d0bb Cleanup user rights on forun commande card 2020-04-21 12:13:15 +02:00
Laurent Destailleur
16e46c672c Clean code 2020-04-20 15:06:27 +02:00
Laurent Destailleur
5254a94038 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ldap.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/index.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/expedition/list.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/list.php
	htdocs/loan/list.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/list.php
 2020-04-16 15:58:59 +02:00
atm-quentin
f7c07640dd viewstatut to search_status 2020-04-15 15:01:00 +02:00
Laurent Destailleur
596ba8d679 Clean deprecated code. 2020-04-13 01:10:35 +02:00
Laurent Destailleur
92b6b1a042 Look and feel v12 2020-04-12 18:13:43 +02:00
Laurent Destailleur
422e33a68b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ihm.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/stats/cabyprodserv.php
	htdocs/filefunc.inc.php
	htdocs/takepos/invoice.php
 2020-04-12 17:01:44 +02:00
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
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Laurent Destailleur
4ff503d20a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/list.php
	htdocs/supplier_proposal/list.php
 2020-04-10 02:07:51 +02:00
Laurent Destailleur
7fe8c7eab3 FIX #11855 2020-04-10 01:37:04 +02:00
Laurent Destailleur
efaea37d61 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2020-03-30 19:42:53 +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
atm-quentin
64207ef58d FIX missing array option 2020-03-30 14:18:59 +02:00
Laurent Destailleur
c27592bad2 Clean deprecated params on all fetch_optionals() 2020-03-27 16:02:58 +01:00
Laurent Destailleur
62fefab5ac Standardize color of status 2020-03-24 19:06:37 +01:00
Laurent Destailleur
01e60562b9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/index.php
	htdocs/takepos/takepos.php
 2020-03-23 15:38:10 +01:00
Laurent Destailleur
ca4b641094 FIX #13407 2020-03-23 15:24:29 +01:00
Laurent Destailleur
7145754376 Can set different warehous, lot during production 2020-03-22 17:06:59 +01:00
Laurent Destailleur
425d2afc4b Rename js into js.php. Fix some labels 2020-03-22 12:31:27 +01:00
Laurent Destailleur
56d6c4691f FIX #13382 Note will be concat to private note 2020-03-18 21:06:36 +01:00
Laurent Destailleur
4841a5bf4a Fix look and feel v11 2020-03-13 16:53:37 +01:00
Laurent Destailleur
c605b743e6 Fix look and feel v11 2020-03-13 16:52:00 +01:00
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
Scrutinizer Auto-Fixer
f413ce6aac Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-12 11:45:44 +00:00
Laurent Destailleur
c8bbaa07fd FIX Look and feel v11 2020-03-11 15:53:08 +01:00
Laurent Destailleur
0bd2740779 NEW Can force position of legend of graph on right (instead of top) 2020-03-05 17:23:19 +01:00
Marc de Lima Lucio
b58608dab0 NEW: supplier order list: enable multicurrency columns 2020-03-03 09:56:25 +01:00
Scrutinizer Auto-Fixer
e44865d8b5 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-21 16:53:37 +00:00
Laurent Destailleur
2ac064059a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/projet/element.php
 2020-02-18 22:40:43 +01:00
Laurent Destailleur
31ae0bc06e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/fourn/commande/index.php
	htdocs/product/card.php
 2020-02-18 22:38:30 +01:00
Regis Houssin
110a23623b FIX an external user can not approved 2020-02-18 11:04:11 +01:00
Regis Houssin
4511cf1060 FIX missing "statut" for getNomUrl() function 2020-02-18 09:03:25 +01:00
Regis Houssin
1034e4a472 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0_mc2 2020-02-18 09:02:35 +01:00
Regis Houssin
f6f0d9d4a2 FIX better method to check user rights AND usergroup rights ! 2020-02-18 08:35:51 +01:00
Regis Houssin
a5de331410 FIX Multicompany compatibility 2020-02-17 19:13:37 +01:00
Laurent Destailleur
f4f3efec62 Fight against $_POST 2020-02-16 19:33:58 +01:00
Laurent Destailleur
80707d6a5e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-28 17:24:26 +01:00
Laurent Destailleur
3a9e238dc6 FIX Missing value of $formconfirm as parameters of hook 2020-01-28 12:00:27 +01:00
Laurent Destailleur
2c40e4be94 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-15 20:13:45 +01:00
Laurent Destailleur
98eda68afb Fix linkg to public notes 2020-01-15 19:49:45 +01:00
Laurent Destailleur
b47db086cb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/inventory/class/inventory.class.php
	htdocs/product/inventory/list.php
 2020-01-10 14:30:42 +01:00
Frédéric FRANCE
7bea60af84 can replace formconfirm in order supplier 2020-01-10 00:27:40 +01:00
Laurent Destailleur
afd32135f2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/takepos/invoice.php
 2020-01-01 22:37:13 +01:00
Laurent Destailleur
7d07c198bc FIX Price of purchase order and vendor invoice with multicurrency 
FIX entering predefined product with a forced unit price
 2020-01-01 17:15:26 +01:00
Laurent Destailleur
2ad483413e Better place to force the default warehouse 2019-12-19 12:05:34 +01:00
stickler-ci
2f41a53bb4 Fixing style errors. 2019-12-19 10:38:19 +00:00
Laurent Destailleur
0f30e6f73b
Update dispatch.php 2019-12-19 11:35:50 +01:00
Laurent Destailleur
a71f0e3472
Merge branch 'develop' into fourn 2019-12-19 11:35:02 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Laurent Destailleur
92070fa491 Fix name of variable $trigger_name into $triggersendname 2019-12-02 09:38:16 +01:00
Frédéric FRANCE
b104133f7a
Update orderstoinvoice.php 2019-11-26 18:29:52 +01:00
Laurent Destailleur
fb70893229 Fix missing class reposition 2019-11-19 21:29:49 +01:00
Laurent Destailleur
2689f7515c Fix pb with colspan and extrafields. 
Fix remove empty id
 2019-11-16 14:38:05 +01:00
Laurent Destailleur
171b94fc5c
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5 
Scrutinizer Auto-Fixes
 2019-11-14 08:50:24 +01:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer
8a527631a0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:02 +00:00
Scrutinizer Auto-Fixer
c85e54b08c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-12 08:46:08 +00:00
Scrutinizer Auto-Fixer
df664e790b Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-11 23:15:34 +00:00
Laurent Destailleur
28b10e4610
Merge pull request #12379 from altatof/dispatch_force_qty_input 
NEW : add constant DISPATCH_FORCE_QTY_INPUT
 2019-11-08 11:38:57 +01:00
Laurent Destailleur
52e90a8d91
Update dispatch.php 2019-11-08 11:38:08 +01:00
Scrutinizer Auto-Fixer
2ecfe41810 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-08 09:53:31 +00:00
altairis
c574f5990f add constant DISPATCH_FORCE_QTY_INPUT 2019-11-07 14:31:30 +01:00
Frédéric FRANCE
001010d5e3
fix phpcs 2019-11-07 12:43:33 +01:00
Laurent Destailleur
af2df62aaa
Merge branch 'develop' into patch-7 2019-11-07 11:23:17 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Frédéric FRANCE
d2e59fc2af
css 2019-11-05 21:14:22 +01:00
Laurent Destailleur
94bd0f71d9 Fix pb with permission 2019-11-05 19:41:30 +01:00
Laurent Destailleur
ce1dec253f FIX #11364 2019-11-05 12:47:38 +01:00
Laurent Destailleur
11500fb8d9 FIX confusion between permto... and permisstionto... 2019-11-04 15:33:49 +01:00
Laurent Destailleur
630a150b09 Fix multicurrency rate must be visible if currency differs only 2019-11-03 17:48:16 +01:00
Laurent Destailleur
ab7c300f43 NEW Can change supplier when cloning a Purchase Order 2019-11-02 20:50:25 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid 
replace deprecated user->societe_id by user->socid
 2019-11-02 13:34:21 +01:00
Laurent Destailleur
45c77b4560 Renaming some libelle into label 2019-11-02 12:59:38 +01:00
Frédéric FRANCE
77d4ca81dc
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-02 09:14:15 +01:00
Laurent Destailleur
cea2c3a9f4 Look and feel v11 2019-11-01 23:58:14 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Frédéric FRANCE
b2b057e9b5
clean indent 2019-10-27 09:51:15 +01:00
Laurent Destailleur
2201b11fd3 NEW Add option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_SALE_PROPOSAL 
NEW Add option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_PROPOSAL
 2019-10-24 13:41:04 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
8da0cd4a35
Merge branch 'develop' into patch-13 2019-10-16 13:32:31 +02:00
Laurent Destailleur
e07e01580d Replace deprecated code with new one 2019-10-16 03:34:32 +02:00
Frédéric FRANCE
b88059433c
Update list.php 2019-10-14 21:36:38 +02:00
Laurent Destailleur
072a0a26d6 Use a font awesome icon to show "shippable" flag on orders. 2019-10-09 18:07:00 +02:00
Laurent Destailleur
43a70e5548 Clean code to use the new $extrafields->attributes array 2019-10-08 09:28:50 +02:00
Laurent Destailleur
f56da782ab
Merge pull request #12038 from Ahuahuachi/develop 
NEW Add hidden options to send by email even for draft status
 2019-10-07 14:18:53 +02:00
Laurent Destailleur
866dcf18fe Look and feel v11 2019-10-06 15:34:22 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
altairis
8b8a5e315a fix test error 2019-10-04 10:55:09 +02:00
altairis
55c0913884 Merge branch 'develop' into fourn 2019-10-04 10:51:28 +02:00