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
6fae2cfebe
Merge branch '13.0' of https://github.com/dolibarr/dolibarr into develop
2021-01-28 00:29:16 +01:00
Laurent Destailleur
79c68c6132
Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 13.0
...
Conflicts:
htdocs/commande/stats/index.php
2021-01-28 00:23:44 +01:00
Laurent Destailleur
2be157c91f
Trans
2021-01-28 00:18:11 +01:00
Anthony Berton
bb1af10cf1
warehouse thirparty affect on proposal or order
2021-01-17 16:48:51 +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
dc9cd28437
Look and feel v14
2021-01-15 13:14:21 +01:00
Laurent Destailleur
4c50f25c12
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-15 11:41:45 +01:00
Laurent Destailleur
bcfe03216a
FIX error managent and db transaction balance
2021-01-14 19:15:54 +01:00
Laurent Destailleur
0d704b0714
FIX error managent and db transaction balance
2021-01-14 19:09:57 +01:00
Laurent Destailleur
bad4b14ba5
Fix properties
2021-01-12 10:34:15 +01:00
Laurent Destailleur
de9835ae47
Merge pull request #15936 from bb2a/warhouse_in_propal
...
NEW Can ask the warehouse in proposal
2021-01-11 16:23:15 +01:00
Laurent Destailleur
e3a1cabd87
Merge pull request #15942 from bb2a/add_alias_on_lists
...
NEW Add column "alias" of company in list of proposal, order, invoice
2021-01-11 15:56:22 +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
Anthony Berton
d6072bae2b
Update list.php
2021-01-10 22:21:18 +01:00
stickler-ci
55e6010d85
Fixing style errors.
2021-01-10 00:15:00 +00:00
Anthony Berton
d3fa8b9f20
20210110
2021-01-10 01:07:27 +01:00
Anthony Berton
bbae40eeea
Update card.php
2021-01-09 17:39:26 +01:00
Anthony Berton
8eaf7b3a3f
1
2021-01-09 17:36:14 +01:00
Anthony Berton
5effd4e897
20210109
2021-01-09 02:45:46 +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
Florian HENRY
7e34d9e6f9
Merge branch '13_backport' into dev_add_column_propal_order
2021-01-05 23:00:58 +01:00
Florian HENRY
296c998a36
enabled
2021-01-05 23:00:35 +01:00
Florian HENRY
6e7172887a
Merge branch '13_backport' into dev_add_column_propal_order
2021-01-05 22:58:00 +01:00
Florian HENRY
510c619c85
space
2021-01-05 22:56:55 +01:00
Florian HENRY
b9bb48a01f
better place and noadmininfo
2021-01-05 22:50:54 +01:00
Florian HENRY
939fecc611
add column payment mode terms shipping on order list
2021-01-05 20:32:29 +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
150b338764
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-02 17:02:08 +01:00
Laurent Destailleur
7b3ed7301d
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/compta/facture/class/facture-rec.class.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2021-01-02 17:01:03 +01:00
Laurent Destailleur
fd4dab495f
FIX Bad cleaning of VAT rate when numbers are into code
2021-01-02 16:51: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
bac2ae0d5f
Fix warnings
2020-12-22 17:33:17 +01:00
Laurent Destailleur
2e02f50993
css
2020-12-17 12:29:52 +01:00
Laurent Destailleur
1b69b1c2fe
Fix phpcs
2020-12-16 10:39:10 +01:00
Laurent Destailleur
69061e422b
Removed warning
2020-12-16 02:44:48 +01:00
Laurent Destailleur
b991badb8c
Fix warning
2020-12-14 13:03:43 +01:00
Laurent Destailleur
acb73966f7
Clean code. Removed phpexcel library.
2020-12-13 16:27:44 +01:00
Laurent Destailleur
3d33d3aa3a
Fix warning
2020-12-13 14:36:00 +01:00
Laurent Destailleur
2592344601
Fix missing price2num
2020-12-12 17:27:27 +01:00
Florian HENRY
2a2b372ba9
fix: manage price min for PRICE PER CUSTOMER
2020-12-10 15:08:36 +01:00
Laurent Destailleur
67425abd29
Merge pull request #15602 from c3do/patch-18
...
API orders: Update demand reason on order update
2020-12-04 19:43:43 +01:00
Laurent Destailleur
040d22ef0a
Fix phpcs
2020-12-04 01:59:47 +01:00
Laurent Destailleur
a1428c963b
Fix phpcs
2020-12-03 16:53:26 +01:00
Laurent Destailleur
56d56929ec
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/dolibarr.php
2020-12-03 16:39:22 +01:00
stickler-ci
9875e73ee2
Fixing style errors.
2020-12-03 15:04:48 +00:00
Cédric
2751d5cefd
Update api_orders.class.php
2020-12-03 16:02:49 +01:00
Cédric
dcc3ecf012
Update commande.class.php
2020-12-03 16:01:17 +01:00
Laurent Destailleur
d8d825f615
FIX #15519
2020-12-03 14:40:14 +01:00
Laurent Destailleur
068587fcee
Update card.php
2020-12-03 14:30:07 +01:00
Florian Mortgat
17d5bb5cd4
FIX 12.0 - error when displaying lines on order after adding a line if both MAIN_MULTILANGS and MAIN_DISABLE_PDF_AUTOUPDATE are activated
2020-12-02 22:25:08 +01:00
Cédric
7788157b19
API orders: Update demand reason on order update
2020-12-01 16:55:43 +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
a2ede3573e
Default selected columns
2020-11-30 08:46:58 +01:00
Laurent Destailleur
6ad7cca647
Fix sort columns
2020-11-30 08:45:16 +01:00
Laurent Destailleur
7634212811
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/phpinfo.php
htdocs/commande/stats/index.php
htdocs/compta/facture/stats/index.php
2020-11-29 21:35:03 +01:00
Laurent Destailleur
d3a2aa664f
FIX #15572
2020-11-29 20:27:40 +01:00
Laurent Destailleur
59b445a103
Clean dead code
2020-11-28 14:47:39 +01:00
Laurent Destailleur
574919de52
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/accountancy/bookkeeping/balance.php
htdocs/adherents/class/subscription.class.php
htdocs/compta/bank/categ.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/class/interfaces.class.php
htdocs/core/lib/project.lib.php
htdocs/core/modules/modCategorie.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/install/repair.php
htdocs/main.inc.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
htdocs/reception/card.php
2020-11-27 15:45:12 +01:00
Laurent Destailleur
ac3c129735
Clean code
2020-11-27 14:24:15 +01:00
Laurent Destailleur
187ba94a57
Look and feel v13
2020-11-26 14:24:52 +01:00
Laurent Destailleur
69b06a25e8
Fix code of deletion of objects
2020-11-26 09:16:16 +01:00
Frédéric FRANCE
83f6e9dfc2
doxygen
2020-11-25 18:08:13 +01:00
Laurent Destailleur
81566289cd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
2020-11-24 11:07:35 +01:00
Laurent Destailleur
890f7a0602
Merge pull request #15497 from atm-john/12.0_fix_thirdparty_propagate_extrafields_to
...
FIX Dol print error : conf usage thirdparty propagate extrafields to
2020-11-23 21:43:03 +01:00
Laurent Destailleur
5822fcfbed
FIX several warning with the barcode use in ODT templates
2020-11-23 21:38:45 +01:00
ATM john
fbc911aea1
Fix conf usage thirdparty propagate extrafields to
2020-11-23 16:40:31 +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
Laurent Destailleur
2f6f242d99
CSS
2020-11-23 12:29:38 +01:00
lvessiller
e87bdd02bd
FIX date order param not empty
2020-11-20 16:10:11 +01:00
lvessiller
4fef8d80a5
FIX keep dates filters parameters on order list
2020-11-20 16:01:51 +01:00
Laurent Destailleur
772d401a64
FIX Restore a more common behavior. Add a hidden constant to switch to a
...
mode when we must enabled load of shippable status.
2020-11-19 19:56:00 +01:00
Laurent Destailleur
06545e005b
Use status constant
2020-11-19 18:55:37 +01:00
lvessiller
7e207e80ae
FIX spaces before IF
2020-11-19 14:29:37 +01:00
lvessiller
73dab143a3
NEW Add an option to hide by default icon shippable order in command list
2020-11-19 14:14:24 +01:00
Florian HENRY
46326d7659
merge from develop
2020-11-19 13:53:34 +01:00
Laurent Destailleur
1dd697767e
Merge branch 'develop' into 13_doc
2020-11-18 18:08:14 +01:00
Laurent Destailleur
6150d3bb2c
Merge pull request #15430 from fappels/13_fix_supplier_barcode
...
Improve doc for customer order delivery date
2020-11-18 12:54:34 +01:00
Francis Appels
9936d8c559
Revert "doc for delivery_date"
...
This reverts commit aed6afc3bf
2020-11-16 17:54:52 +01:00
Francis Appels
aed6afc3bf
doc for delivery_date
2020-11-16 17:37:38 +01:00
Laurent Destailleur
6bbeb6d3a0
Fix debug creation of shipment with virtual product.
2020-11-16 16:31:05 +01:00
Laurent Destailleur
96b15420f0
Fix regression
2020-11-16 12:56:13 +01:00
Laurent Destailleur
6c42535eb2
Maxi debug v13
2020-11-16 12:20:18 +01:00
Laurent Destailleur
90884d8085
Fix compatibility with date_delivery
2020-11-11 18:08:40 +01:00
Laurent Destailleur
6536208a14
Merge pull request #15322 from OPEN-DSI/new-list-include-array-extra-fields-with-langfile
...
NEW include tpl for loading lang file for extra fields in list
2020-11-10 14:42:21 +01:00
Laurent Destailleur
560b8db44a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-11-09 15:29:17 +01:00
Laurent Destailleur
1d90ee2765
FIX #15336 set_thirdparty was not used anymore. Removed dead code.
2020-11-09 15:28:18 +01:00
Scrutinizer Auto-Fixer
f6e3f58fcb
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-11-09 14:18:56 +00:00
Laurent Destailleur
5be634cbd4
Clean code
2020-11-09 11:34:58 +01:00
Laurent Destailleur
a9fbe9dd6c
Fix remove warning
2020-11-08 00:18:41 +01:00
lvessiller
4ddff7173f
NEW include tpl for loading lang file for extra fields in list
2020-11-06 12:19:45 +01:00
Laurent Destailleur
9e967a578e
FIX #14985 - I vertion option RELOAD_PAGE_ON_CUSTOMER_CHANGE
2020-11-03 02:17:51 +01:00
Laurent Destailleur
83a7b19333
Look and feel v13
2020-11-02 11:41:07 +01:00
Scrutinizer Auto-Fixer
ab25e047c0
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 17:51:30 +00: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
Frédéric FRANCE
8190711342
doxygen
2020-10-30 18:01:01 +01:00
Scrutinizer Auto-Fixer
208740c9c4
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-28 16:49:52 +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
Laurent Destailleur
1b939ab8f4
Merge pull request #15183 from frederic34/dol_fiche_end
...
end of dol_fiche_end
2020-10-27 19:00:32 +01:00
Laurent Destailleur
50cf7704fe
Log
2020-10-27 18:30:03 +01:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end
2020-10-27 18:19:31 +01:00
Francis Appels
93ab281d81
Fix tab indent
2020-10-26 18:21:47 +01:00
Francis Appels
91496682fb
Merge branch '13_set_date_livraison' of github.com:fappels/dolibarr into 13_set_date_livraison
2020-10-26 18:13:36 +01:00
Francis Appels
3ff6f6a04a
Move phpcs enable to correct location @frederic34
2020-10-26 18:13:25 +01:00
stickler-ci
d803c7f429
Fixing style errors.
2020-10-26 16:06:05 +00: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
7c2b5b614f
NEW: preload product description on selection for customer propal/order/invoice
2020-10-25 19:13:09 +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
Laurent Destailleur
4d9c8e2225
Merge pull request #15124 from frederic34/retrieve
...
retrieve the spelling
2020-10-25 14:48:51 +01:00
Laurent Destailleur
bb147d2599
FIX #15140
2020-10-25 14:12:34 +01:00
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉
2020-10-23 20:08:35 +02:00
Laurent Destailleur
58597bc8fe
Merge pull request #15058 from Hystepik/develop
...
FIX pb of duplicate event on command
2020-10-23 14:12:42 +02:00
lmarcouiller
42aafeb8b5
FIX pb of duplicate event on command with eldy's recommendations
2020-10-23 09:56:35 +02:00
Frédéric FRANCE
9a470fa42d
replace deprecated
2020-10-22 22:50:03 +02:00
lmarcouiller
1ee8c34bf5
FIX pb of duplicate event on command when refreshing the page after command classification as billed or closed
2020-10-19 14:20:49 +02:00
lmarcouiller
90b2d41b02
FIX pb of duplicate event on command when refreshing the page after command classification as billed or closed
2020-10-19 14:19:34 +02:00
lmarcouiller
64d8d5334c
FIX pb of duplicate event on command when refreshing the page after command classification as billed or closed
2020-10-19 14:12:32 +02:00
lmarcouiller
edd391da3a
FIX pb of duplicate event on command when refreshing the page after command classification as billed or closed
2020-10-19 14:09:55 +02:00
lmarcouiller
511943c052
FIX pb of duplicate event on command when refreshing the page after command classification as billed or closed
2020-10-19 14:05:32 +02:00
lmarcouiller
71db2603e1
FIX pb of duplicate event on command when refreshing the page after command classification as billed or closed
2020-10-19 13:52:12 +02:00
Laurent Destailleur
7504f92a41
Standardize code and look and feel
2020-10-16 13:30:20 +02:00
Laurent Destailleur
bc1ad96ad1
FIX #14993
2020-10-14 19:28:59 +02:00
Laurent Destailleur
fcd4645509
Standardize code: Property product_libelle renamed into product_label
...
Move common vars declaration into parent class.
2020-10-12 19:33:00 +02:00
Rüdiger Hahn
d789aaad7f
Fix for #14239
...
Message: Error: Method printObjectLine was called on an object and object->fetch_thirdparty was not done before
2020-10-09 11:29:39 +02:00
Aurélien
b6283c1a5d
Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery
2020-10-08 16:19:10 +02:00
Laurent Destailleur
70fa262293
CSS
2020-10-08 09:30:15 +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
AurelienBinard
39d538befc
Merge branch 'develop' into translateModLivraison2ModDelivery
2020-10-06 16:20:25 +02:00
Aurélien
f954e8b173
:mod livraison rename user acces right #14697
2020-10-06 16:10:48 +02:00
Aurélien
c8cd55e158
debug access right after rename class #14697
2020-10-06 15:57:50 +02:00
Aurélien
1af42b313c
rename livraison pdf and dependencies #14697
2020-10-06 13:32:02 +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
af7c23b2ac
rename folder admin/livraison.php and dependencies #14697
2020-10-06 12:05:24 +02:00
Aurélien
5571a166c6
change variable #14697
2020-10-06 11:37:55 +02:00
Laurent Destailleur
a6fe03bd14
Fix doc
2020-10-04 23:30:41 +02:00
Laurent Destailleur
c806ae2654
Merge pull request #14792 from c3do/patch-15
...
FIX API Order unlink contact did not work like expected
2020-10-03 15:30:07 +02:00
Laurent Destailleur
5256229089
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-10-02 13:51:47 +02:00
Laurent Destailleur
10deb1baad
Clean code - Removed no more used files orderstoinvoice.php
2020-10-02 13:51:32 +02:00
Laurent Destailleur
193c9ac803
Merge pull request #14892 from atm-john/develop_new_search_param_for_order_close_date
...
NEW Add search param for close date on order list
2020-10-02 13:42:02 +02:00
Florian HENRY
18c946dc75
add missing translation
2020-10-02 10:37:02 +02:00
Florian HENRY
1bbd4da0fe
add missing translation
2020-10-02 10:36:16 +02:00
stickler-ci
a7b4f0ec49
Fixing style errors.
2020-10-02 07:43:29 +00:00
John Botella
f31e689480
Fix new look and feel
2020-10-02 09:39:54 +02:00
John Botella
ac7a747004
Merge branch '12.0_new_search_param_for_order_close_date' into develop
2020-10-02 09:19:25 +02:00
Laurent Destailleur
d912908aef
NEW Can build vendor invoice from vendor orders
2020-10-01 19:05:20 +02:00
Laurent Destailleur
ece8037f42
The button "Invoice orders" switch to page with lines autoselected.
2020-10-01 18:08:46 +02:00
Laurent Destailleur
7b3a7c9921
Add token on all url with action=delete
2020-10-01 10:50:54 +02:00
John Botella
afbe5f6017
Add search param for close date
2020-09-30 15:26:13 +02:00
Laurent Destailleur
a3da2afe7a
Add option MAIN_LIST_ALLOW_PUBLIC_NOTES + MAIN_LIST_ALLOW_PRIVATE_NOTES
2020-09-30 11:58:40 +02:00
Cédric
3bc9c49307
Update api_orders.class.php
2020-09-28 16:57:30 +02:00
Sekan, Tobias
2bf15b3a92
Show category filter only on rights to read it
2020-09-28 10:42:49 +02:00
Laurent Destailleur
f851ce2f0f
Merge pull request #14741 from Tim-Otte/fix-zero-price-lines
...
FIX: Allow product price equal zero in new lines
2020-09-27 20:46:36 +02:00
Tobias Sekan
a72519f353
Merge branch 'develop' into PreselectThirpartyOnNewFromList
2020-09-23 09:09:42 +02:00
Laurent Destailleur
6c06d2f0aa
Look and feel v13
2020-09-22 15:26:29 +02:00
Tim Otte
e373de91d9
Fixed a bug where a price equal zero would be replaced with the product price
2020-09-22 14:43:09 +02:00
Laurent Destailleur
216b3c885d
Fix escaping
2020-09-20 01:30:36 +02:00
Cédric
68ccbac49c
Update api_orders.class.php
2020-09-19 22:35:33 +02:00
Laurent Destailleur
b6c6473cce
Fix sql injection when forging requests with IN
2020-09-18 17:47:40 +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
Laurent Destailleur
e5191cad24
Move code of incoterm into the Incoterm Trait.
2020-09-16 02:50:18 +02:00
Scrutinizer Auto-Fixer
73915d51c8
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-14 02:30:04 +00: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
Laurent Destailleur
990af9d5cf
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formmail.class.php
2020-09-12 04:25:54 +02:00
Laurent Destailleur
64b28020c8
Look and feel v13
2020-09-11 13:14:14 +02:00
Laurent Destailleur
0d124730a8
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/list.php
2020-09-10 18:05:18 +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
Laurent Destailleur
ca6e57b2f7
FIX Filter in "billed" of orders was not saved
2020-09-07 14:25:50 +02:00
stickler-ci
ebb69e9d6e
Fixing style errors.
2020-09-04 19:38:49 +00:00
Cédric
e84a2ab07c
Fix addline commande.class.php
2020-09-04 21:26:57 +02:00
Cédric
c06cb1eff3
NEW ref_ext for order lines
2020-09-04 21:25:20 +02:00
Cédric
1f82fcc1f0
NEW ref_ext field for order lines
2020-09-04 21:11:58 +02:00
Cédric
9141b6b092
NEW endpoint getContacts and Clean results
...
NEW Get contacts list of a given order
FIX bad function used to unlink a contact
FIX Result for link contact and unlink contact
2020-09-04 12:36:03 +02:00
Juanjo Menent
9bd5ed627f
Fix travis issues
2020-09-04 09:55:02 +02:00
Juanjo Menent
bb92e64e43
FIX : #14474 Error when deleting
2020-09-03 12:43:38 +02:00
Laurent Destailleur
ad87e753b4
Clean trim on GETPOST (already included inside GETPOST when not 'none'
2020-08-28 21:27:50 +02:00
Anthony Berton
458bc66327
Update list.php
2020-08-25 17:25:34 +02:00
florian HENRY
0453dd8f09
fix php warning : count parameters must be countable
2020-08-20 16:39:14 +02:00
Laurent Destailleur
7217dc3114
Better perf for phpunit on very large databases
2020-08-19 01:43:48 +02:00
Laurent Destailleur
964c4ef0d2
Standardize code. Use model_pdf.
2020-08-18 14:48:38 +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
2076d18825
FIX Param of fetch_name_optionals_label must be object->table_element
2020-08-04 12:47:09 +02:00
Tim Otte
0e03578e91
Fixed translation of product units in documents
2020-08-04 11:51:40 +02:00
Laurent Destailleur
e455f8afa6
Merge pull request #14369 from Tim-Otte/fix-product-unit-translation
...
Fixed translation of product units in documents
2020-08-04 11:50:50 +02:00
Tim Otte
360afccecc
Fixed translation of product units in documents
2020-08-04 11:02:16 +02:00
Laurent Destailleur
42234ba506
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/price.lib.php
2020-07-24 00:07:57 +02:00
Oarces DEV
f3e3c47af3
Add the possibility for the prospect to order
...
A prospect can do make order everywhere in Dolibarr, except in order tab...
https://www.dolibarr.fr/forum/t/nouvelle-commande-ou-sont-les-prospects/33275/7
2020-07-18 23:04:22 +02:00
Laurent Destailleur
4fd970af28
Fix phpcs
2020-07-07 01:29:31 +02:00
Laurent Destailleur
14c98f277b
NEW Can change VAT rate of all lines of a draft object in one step.
2020-07-06 22:48:22 +02:00
Laurent Destailleur
6c01cc16f8
Update commande.class.php
2020-07-03 00:14:22 +02:00
quentin
642e75c3dd
FIX wrong origin
2020-07-02 14:16:31 +02:00
Laurent Destailleur
333d4873c3
Properties ->contactid has been renamed into ->contact_id
2020-06-25 12:17:47 +02:00
Laurent Destailleur
f92426034f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/website/index.php
2020-06-03 01:06:27 +02:00
Laurent Destailleur
9e6bb6f784
Sanitize params
2020-06-02 20:19:45 +02:00
Laurent Destailleur
7ceb236a09
Fix look and field v12
2020-05-26 14:45:45 +02:00
Laurent Destailleur
48137f8cad
Fix look and field v12
2020-05-26 14:43:50 +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
Laurent Destailleur
127534ef55
Fix common var name seems to be $objref for subdir of doc
2020-05-23 20:09:31 +02:00
Frédéric FRANCE
5aa84c64d0
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-23 18:54:33 +02:00
Laurent Destailleur
4913d10724
Merge branch 'develop' into patch-339
2020-05-23 15:14:06 +02:00
Frédéric FRANCE
70995d3499
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-22 15:03:09 +02:00
Laurent Destailleur
2f8b364454
Code comment
2020-05-22 13:18:47 +02:00
Frédéric FRANCE
b41ac00b98
add new rule
2020-05-21 15:05:19 +02:00
Frédéric FRANCE
ee6fadd0d5
add new rule
2020-05-21 01:41:27 +02:00
ptibogxiv
70ea77ce8f
Update list.php
2020-05-12 15:37:37 +02:00
stickler-ci
83ec39f55a
Fixing style errors.
2020-05-12 11:44:12 +00:00
ptibogxiv
e1ff1bf865
Update card.php
2020-05-12 13:42:43 +02:00
stickler-ci
9e49e02efb
Fixing style errors.
2020-05-12 11:42:18 +00:00
ptibogxiv
014c013f83
Update card.php
2020-05-12 13:40:31 +02:00
Laurent Destailleur
4584fa1aa6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/asset/list.php
htdocs/compta/bank/list.php
htdocs/contrat/services_list.php
htdocs/core/lib/date.lib.php
htdocs/expensereport/list.php
htdocs/fichinter/list.php
htdocs/holiday/list.php
htdocs/projet/tasks/list.php
htdocs/supplier_proposal/list.php
htdocs/user/list.php
2020-05-11 19:43:06 +02:00
Maxime Kohlhaas
1a9afe6b20
Fix missing hook params for printFieldListValue
2020-05-08 01:40:25 +02:00
Scrutinizer Auto-Fixer
8f0e00b4aa
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-05-02 01:39:56 +00:00
DEMAREST Maxime (Indelog)
790cffb7ae
Correct select label for categories in stats pages
2020-04-29 15:24:13 +02:00
DEMAREST Maxime (Indelog)
1bd9372022
Forgot comments to document news params for the modified methods
2020-04-29 10:00:29 +02:00
DEMAREST Maxime (Indelog)
40f1bed8d0
Add possibility to filter stats by ThirdParty type and categorie
2020-04-29 09:17:44 +02:00
Laurent Destailleur
6b1a1e5e58
FIX #13743
2020-04-27 15:09:27 +02:00
Laurent Destailleur
3090eb578b
Look and feel v12
2020-04-25 17:43:12 +02:00
Laurent Destailleur
1121d2c1c6
Look and feel v12
2020-04-25 13:49:44 +02:00
Laurent Destailleur
7bbfd2175d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.dispatch.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/reception/class/reception.class.php
2020-04-24 18:58:47 +02:00
Marc Guenneugues
be46b2062e
Clean line extrafields when deleting order
2020-04-23 17:51:06 +02:00
Laurent Destailleur
72c6ac1c72
Complete #13708 , normalization of code
2020-04-23 13:21:39 +02:00
Laurent Destailleur
16e46c672c
Clean code
2020-04-20 15:06:27 +02:00
Laurent Destailleur
fe674f08d9
Fix option WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER
2020-04-20 03:00:10 +02:00
Laurent Destailleur
6472f521ac
css
2020-04-20 00:54:38 +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
0845f0bcd3
Merge pull request #13523 from bb2a/patch-2
...
add in default search
2020-04-10 12:12:28 +02:00
Laurent Destailleur
5ff981bf61
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/user/perms.php
2020-04-10 12:04:21 +02:00
Laurent Destailleur
874cbcefc7
Fix permission to close a proposal or order was not correctly used
...
#13547
2020-04-10 11:54:14 +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
Anthony Berton
620161f0e7
Update list.php
2020-04-10 10:47:34 +02: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
a27a499727
Merge pull request #13157 from bb2a/patch-17
...
Add search order to assign to a warehouse
2020-04-08 14:54:36 +02:00
Laurent Destailleur
4170580d88
Rename const
2020-04-03 12:54:23 +02:00
Laurent Destailleur
99ddd25ad5
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-04-02 16:51:50 +02:00
Florian Mortgat
4d2b4583d0
FIX - This error logs an Orderline::delete error, but this is an Orderline::insert error
2020-04-02 09:28:56 +02:00
Laurent Destailleur
4207d94f53
FIX Bad position of total in column
...
Conflicts:
htdocs/fourn/facture/paiement.php
2020-03-27 19:10:01 +01:00
Laurent Destailleur
a4797634d5
FIX Bad position of total in column
2020-03-27 19:08:39 +01: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
a5379c7144
FIX All forms must use newToken()
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/cashcontrol/cashcontrol_card.php
htdocs/supplier_proposal/card.php
2020-03-24 13:14:23 +01:00
Laurent Destailleur
1ff15e1fd9
FIX All forms must use newToken()
2020-03-24 13:10:35 +01:00
Laurent Destailleur
2b33ef7e46
Align color of graph of status on status color
2020-03-24 13:06:59 +01:00
Scrutinizer Auto-Fixer
e8083e2a65
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-23 14:54:02 +00:00
Laurent Destailleur
56d6c4691f
FIX #13382 Note will be concat to private note
2020-03-18 21:06:36 +01:00
Laurent Destailleur
8bab245c7e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/tpl/contacts.tpl.php
2020-03-18 18:50:55 +01:00
Laurent Destailleur
9525289488
Fix return code of some API
2020-03-17 13:50:20 +01:00
Anthony Berton
fa2ccf6c44
Merge branch 'develop' into patch-17
2020-03-17 11:22:07 +01:00
Laurent Destailleur
8192e9dc67
FIX Missing token in form
2020-03-14 03:02:49 +01:00
Laurent Destailleur
33c5db9cc3
Prepare code for the new pagination possibility
2020-03-13 13:07:11 +01:00
Laurent Destailleur
d380da3f4c
Merge pull request #13250 from FHenry/dev_fix_createLineWithCOrrectLink
...
NEW : special option MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION to store in document line created form other documents lines the id of original lines and origin class line rather than origin object id and origin object type
2020-03-12 12:57:04 +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
florian HENRY
eaa9d22783
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_fix_createLineWithCOrrectLink
2020-03-12 09:45:04 +01:00
florian HENRY
29b2ea77d5
NEW : special option MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION to store in document line created form other document s lines the id of origin lines and origin class line rather than origin object id and origin object type
2020-03-12 09:44:43 +01:00
Laurent Destailleur
82f0d8a3bc
Fix bad params
2020-03-09 17:38:47 +01:00
Laurent Destailleur
3edc3dd382
Fix fields definition
2020-03-08 20:10:31 +01:00
Laurent Destailleur
343a80fd3d
Fix table fields
2020-03-08 19:25:00 +01:00
Laurent Destailleur
054ffb7547
Depreciate variables not used by Dolibarr.
2020-03-06 14:38:06 +01:00
Laurent Destailleur
ad9d0a3472
Fix graph of product distribution when too much record
2020-03-06 12:45:02 +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
Laurent Destailleur
fc31680bd0
Several fix for chart.js graphs
2020-03-05 02:55:06 +01:00
Laurent Destailleur
7d0d0aa75a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
2020-03-04 01:56:50 +01:00
Laurent Destailleur
0b37c2c201
FIX #13263
2020-03-04 00:53:07 +01:00
Laurent Destailleur
88059a52d8
Merge branch 'develop' into patch-17
2020-03-03 23:24:14 +01:00
Laurent Destailleur
2b6aaa652d
Merge pull request #13256 from ATM-Marc/NEW_list_multicurrency
...
NEW: add multicurrency columns to document lists
2020-03-03 23:12:53 +01:00
Laurent Destailleur
7866f89585
Merge pull request #13260 from atm-quentin/FIX_ecm_files
...
FIX ecm_files didnt match cause document ref contained "/"
2020-03-03 23:09:02 +01:00
atm-quentin
9446138951
FIX ecm_files didnt match cause document ref contained "/"
2020-03-03 12:07:18 +01:00
Marc de Lima Lucio
5f5824daaa
FIX: order list: remove useless multicurrency lines
2020-03-03 10:43:23 +01:00
florian HENRY
dbb80aecd1
Fix line origin and Id when create order from
2020-03-02 15:22:35 +01:00
Anthony Berton
5520df4e4f
Update list.php
2020-03-02 08:25:18 +01:00
Marc de Lima Lucio
5d1f91f8ac
FIX: muticurrency columns: remove useless column totals that mix currencies together
2020-02-27 17:37:36 +01:00
Marc de Lima Lucio
341e4ae856
NEW: order list: enable multicurrency columns
2020-02-27 14:49:34 +01:00
Laurent Destailleur
a17fba8321
Merge pull request #13158 from bb2a/patch-18
...
Default warehouse to create order
2020-02-26 16:45:25 +01:00
Anthony Berton
54b23a1e1c
Update card.php
2020-02-21 22:54:12 +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
Anthony Berton
02a5c1b8d6
Update card.php
2020-02-20 22:40:43 +01:00
Anthony Berton
8777033bff
Update list.php
2020-02-20 22:18:34 +01:00
Laurent Destailleur
44eda2d4ad
Fix doxygen
2020-02-20 13:42:43 +01:00
Laurent Destailleur
18b99254a1
Experiment ORDER_ENABLE_NEGATIVE
2020-02-18 20:55:22 +01:00
Laurent Destailleur
dc3a15945d
Add method getKanbanView()
2020-02-16 12:05:00 +01:00
Laurent Destailleur
35ada37d4d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal/list.php
htdocs/filefunc.inc.php
2020-02-14 19:14:26 +01:00
Laurent Destailleur
bb895cb1d8
FIX ref_client not visible in tooltip.
2020-02-13 18:00:59 +01:00
Scrutinizer Auto-Fixer
011803ac71
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-13 11:36:05 +00:00
Laurent Destailleur
f70dd8ec06
Clean code. Load thirdparty for correct lang before generating doc
2020-02-10 00:22:53 +01:00
Scrutinizer Auto-Fixer
5fda829023
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-30 00:48:28 +00: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
842a9b9ef7
Merge pull request #12917 from ptibogxiv/patch-294
...
fix sql on order list
2020-01-26 22:25:33 +01:00
Laurent Destailleur
0f2141269a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-01-25 14:43:57 +01:00
Laurent Destailleur
09f809f347
FIX #12913
2020-01-25 14:03:24 +01:00
ptibogxiv
13045748f3
fix sql on order list
2020-01-23 15:26:22 +01:00
Laurent Destailleur
3c2d0b97f4
Merge pull request #12895 from atm-quentin/NEW_author_order_list
...
NEW author on order list
2020-01-22 13:58:53 +01:00
Laurent Destailleur
2d07a08e55
Fix init of specimen
2020-01-21 00:22:57 +01:00
Laurent Destailleur
80483fc085
Fix init of specimen
2020-01-21 00:20:03 +01:00
atm-quentin
61c0940c20
NEW user on order list
2020-01-20 15:42:09 +01:00
Laurent Destailleur
526ae83e8f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-19 19:49:16 +01:00
Laurent Destailleur
e679e05f57
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-19 19:49:04 +01:00
Laurent Destailleur
e803e06c0d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/admin/tools/listevents.php
htdocs/commande/class/commande.class.php
htdocs/core/lib/functions.lib.php
htdocs/expensereport/card.php
htdocs/exports/export.php
2020-01-19 19:01:46 +01:00
Laurent Destailleur
f4ae869678
Fix error return when creating order with not enough stock
2020-01-19 12:15:47 +01:00
Scrutinizer Auto-Fixer
8744f6ab7b
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-18 15:17:07 +00:00
Laurent Destailleur
c556f60c89
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-16 18:13:35 +01:00
Laurent Destailleur
ad7278e6a5
FIX Label of DEPOSIT on screen
...
Fix look and feel v11
2020-01-16 02:48:24 +01:00
Laurent Destailleur
2b7e45cb09
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-15 20:13:54 +01:00
Laurent Destailleur
98eda68afb
Fix linkg to public notes
2020-01-15 19:49:45 +01:00
Laurent Destailleur
5dde548133
Merge pull request #12377 from aspangaro/11.0_a6
...
NEW Customer command list - Add date start & date end
2020-01-15 17:55:47 +01:00
Laurent Destailleur
e2e06b47ff
FIX #12617
2020-01-13 15:58:03 +01:00
Alexandre SPANGARO
0f81fbe1c5
Merge remote-tracking branch 'upstream/develop' into 11.0_a6
2019-12-23 21:19:32 +01:00
Laurent Destailleur
2dee5e6bf1
Fix delay and useless code
2019-12-21 14:35:39 +01:00
Laurent Destailleur
f44b85f557
Fix $_SESSION['newtoken'] must be newToken()
2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer
c8baaa2995
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-16 12:06:25 +00:00
Laurent Destailleur
ce47de453e
Fix HTML5
2019-12-12 10:31:08 +01:00
Laurent Destailleur
93d66d8213
Debug v11
2019-12-06 08:50:26 +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
84e1e6ccf1
Update document.php
2019-11-25 23:58:14 +01:00
Laurent Destailleur
19fb6bfd17
FIX Use PROV as temporary ID for leaves
2019-11-24 18:25:55 +01:00
Laurent Destailleur
31956d8912
Standard of REST API URL
2019-11-22 15:11:28 +01:00
Scrutinizer Auto-Fixer
e36ee63ab6
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-22 13:16:38 +00:00
Philippe GRAND
2c183fe279
fix : invoid sql injection
2019-11-21 09:22:44 +01:00
Laurent Destailleur
fb70893229
Fix missing class reposition
2019-11-19 21:29:49 +01:00
Alexandre SPANGARO
556bdd35d9
Merge remote-tracking branch 'upstream/develop' into 11.0_a6
2019-11-17 21:11:41 +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
Laurent Destailleur
86094613e8
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4
...
Scrutinizer Auto-Fixes
2019-11-14 08:50:06 +01:00
Scrutinizer Auto-Fixer
b40ecc3933
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:37:08 +00: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
Laurent Destailleur
c02cd80b75
Clean code
2019-11-12 10:11:30 +01: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
Frédéric FRANCE
2148d6ed05
css
2019-11-11 20:33:34 +01:00
Alexandre SPANGARO
9ff10d430b
NEW Customer command list - Add date start & date end
2019-11-07 13:57:04 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent
2019-11-05 21:24:41 +01:00
Laurent Destailleur
94bd0f71d9
Fix pb with permission
2019-11-05 19:41:30 +01:00
Laurent Destailleur
71a83b4d7e
Fix phpcs
2019-11-05 15:49:54 +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
89f1904793
Finish removing of ->attribute_label
2019-11-02 17:26:26 +01:00
Laurent Destailleur
3aed55caa6
Merge pull request #12204 from dolibarr95/patch-57
...
NEW: Reduce the $companystatic calls
2019-11-02 13:46:53 +01:00
Laurent Destailleur
25e64b0610
Merge branch 'develop' into socid
2019-11-02 12:01:06 +01:00
Frédéric FRANCE
385cb1a26c
doxygen Commande class
2019-11-02 09:27:06 +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
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid
2019-11-01 21:39:20 +01:00
Laurent Destailleur
e3b5be7475
All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed
...
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
2019-11-01 12:52:03 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid
2019-10-31 20:46:31 +01:00
dolibarr95
5b57bf1f61
array name error
2019-10-30 08:42:43 +01:00
iouston
e88af13101
NEW : add name_alias in fields to search all
2019-10-29 11:22: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
stickler-ci
393c671b26
Fixing style errors.
2019-10-23 06:59:14 +00:00
dolibarr95
da136ef641
Reduce the $companystatic calls
...
Store $companystatic->getNomUrl() in $getNomUrl_cache[];
2019-10-23 08:57:07 +02:00
stickler-ci
e807cb6b03
Fixing style errors.
2019-10-22 15:00:58 +00:00
dolibarr95
d0a599a1d8
Reduce the $companystatic calls
2019-10-22 15:51:30 +02:00
Laurent Destailleur
05fed5358a
Merge pull request #12179 from c3do/develop
...
NEW Add API to get objects by ref, ref_ext, ...
2019-10-20 13:42:18 +02:00
Laurent Destailleur
54b7886331
Update api_orders.class.php
2019-10-20 13:40:18 +02:00
Frédéric FRANCE
66b0c27645
clean indent in commande dir
2019-10-20 09:58:31 +02:00
c3do
4292d72ea3
Can get order by ref, ref_ext, ref_int
2019-10-19 23:42:55 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
2019-10-16 20:00:01 +02:00
Laurent Destailleur
b9ec45fd49
Clean code
2019-10-16 14:02:13 +02:00
Laurent Destailleur
b0355dd149
Module BOM have now status DRAFT, VALIDATED, DISABLED
2019-10-16 01:20:58 +02:00
Laurent Destailleur
e94d47daf7
Work on MRP module
2019-10-15 19:57:23 +02:00
Laurent Destailleur
c8d3aea18a
Update document.php
2019-10-14 21:20:17 +02:00
iouston
720245422e
Update document.php
...
add 2 hidden options for sort files on document page
2019-10-14 15:04:49 +02:00
Laurent Destailleur
b6c600c171
css
2019-10-10 11:44:03 +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
c83f40fc7e
Debug contact by default
2019-10-07 15:42:37 +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
Alfredo Altamirano
140784d741
Merge remote-tracking branch 'Dolibarr/develop' into develop
2019-10-03 20:32:26 -05:00
Alfredo Altamirano
b6882af1b6
Add hidden options to send by email for all status
2019-10-03 20:21:13 -05:00
Laurent Destailleur
24570f7165
Look and feel v11. Picto are fontawesome.
2019-10-02 18:14:41 +02:00
Laurent Destailleur
68055e579f
Check array is array
2019-10-01 16:26:55 +02:00
Laurent Destailleur
b79831ec39
Merge pull request #11952 from aspangaro/11.0_https
...
Move Gnu.org to https
2019-10-01 14:48:21 +02:00
Alexandre SPANGARO
16c6c9ae75
Merge remote-tracking branch 'upstream/develop' into 11.0_https
2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd
Merge branch 'develop' into 11.0_https
2019-10-01 06:11:43 +02:00
Frédéric FRANCE
f3a38ef1af
Update api_orders.class.php
2019-09-30 21:41:07 +02:00
Laurent Destailleur
b28cd1bb57
Merge pull request #11972 from aspangaro/11.0_fa_icon
...
NEW Add fa_icon on load_fiche_titre
2019-09-30 15:26:28 +02:00
Alexandre SPANGARO
aec50d3ac9
NEW Add fa_icon on load_fiche_titre
2019-09-30 10:14:55 +02:00
Laurent Destailleur
86e5465197
Standardize extrafields code
2019-09-28 10:55:09 +02:00
Alexandre SPANGARO
02dbc11f98
Move Gnu.org to https
2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
1c13a38ce9
Typo abscissa
2019-09-23 21:45:23 +02:00
Laurent Destailleur
9f6fe0bf5a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/orders.lang
2019-09-14 18:27:58 +02:00
Regis Houssin
5f23ba5467
FIX avoid non numeric warning
2019-09-12 08:04:53 +02:00
Laurent Destailleur
09d6826e62
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/supplier_order.php
htdocs/langs/en_US/admin.lang
2019-09-06 14:27:01 +02:00
Laurent Destailleur
529dd05226
Replace deprecated code
2019-09-06 10:53:05 +02:00
Laurent Destailleur
626e3fd90e
Fix look and feel v10
2019-09-06 02:34:24 +02:00
Christophe Battarel
32c6c754c4
Merge branch 'develop' into oldline
2019-09-05 16:19:38 +02:00
Laurent Destailleur
98459363df
Merge pull request #11795 from jtraulle/fix-doxygen-examples
...
Fix Wrongly catched examples by Doxygen
2019-09-03 12:45:23 +02:00
Laurent Destailleur
a269082d70
Replace deprecated code with new one
2019-09-02 03:58:00 +02:00
Jean Traullé
c32c7d48ba
Fix Wrongly catched examples by Doxygen
2019-08-30 17:14:59 +02:00
Laurent Destailleur
05c9e97fe4
The deprecated method get_OutstandingBill has been removed. You can use
...
getOutstandingBills() instead.
2019-08-29 00:45:02 +02:00
Laurent Destailleur
f9094cfc44
Update card.php
2019-08-27 15:00:41 +02:00
Maxime Kohlhaas
9c09876bd4
Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_choose_lines_from_origin
2019-08-27 14:33:34 +02:00
Maxime Kohlhaas
4bd806ea65
Move $selectedlines to parameter
2019-08-27 14:33:28 +02:00
Laurent Destailleur
3eb32360ce
Fix escape
2019-08-27 14:10:23 +02:00
Laurent Destailleur
9e04eccf54
Fix syntax error
2019-08-26 23:28:06 +02:00
Frans Bosman
23311abd6a
Update card.php
2019-08-25 19:57:49 +02:00
Frans Bosman
a822a34a51
Update card.php
2019-08-25 19:54:42 +02:00
Frans Bosman
e15d91640b
Update card.php
2019-08-22 09:43:04 +02:00
Laurent Destailleur
3f105a97bf
Debug the new workboard
2019-08-18 04:56:48 +02:00
Laurent Destailleur
5351d78a96
Merge branch 'develop' into develop_new_dashboard
2019-08-18 01:26:56 +02:00
Regis Houssin
7c8b3c9a38
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-08-13 07:34:02 +02:00
Laurent Destailleur
ee37cbd412
Merge pull request #11638 from ptibogxiv/patch-212
...
NEW list by date_cloture on order list
2019-08-10 01:06:16 +02:00
Laurent Destailleur
14fabeb377
Variable rangtouse -> ranktouse
2019-08-10 00:46:20 +02:00
ptibogxiv
0cbb144628
Update list.php
...
sometimes we need to get last update or closed order
2019-08-05 20:52:27 +02:00
ptibogxiv
f417c85186
NEW list by date_cloture on order list
2019-08-05 20:49:41 +02:00
John Botella
b4c4e5a662
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard
2019-08-02 14:52:01 +02:00
Laurent Destailleur
d7a41c6b72
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
2019-08-01 12:54:27 +02:00
John Botella
9b84987cc1
prepare new dashboard
2019-08-01 12:33:19 +02:00
Laurent Destailleur
5eb8f05061
FIX #11584
2019-08-01 12:23:02 +02:00
Regis Houssin
d9ea61e47c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop_menu
Conflicts:
htdocs/commande/class/commande.class.php
2019-07-31 12:49:56 +02:00
Laurent Destailleur
11e3aa5860
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-29 11:07:11 +02:00
Laurent Destailleur
7931f0b422
Fix sql error
2019-07-29 11:06:39 +02:00
Laurent Destailleur
a5e3adc6f1
Fix travis
2019-07-29 10:51:17 +02:00
Laurent Destailleur
db461792a0
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-29 01:36:35 +02:00
Laurent Destailleur
9a7113f4f5
FIX Update the file index table when we validate/rename a ref.
2019-07-28 22:26:55 +02:00
Maxime Kohlhaas
5c2763d0dd
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_choose_lines_from_origin
2019-07-27 10:53:43 +02:00
Laurent Destailleur
865ebb9de2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/ticket/class/ticket.class.php
2019-07-20 13:29:10 +02:00
Laurent Destailleur
e5c3945ec3
FIX delete of links between objects
2019-07-19 18:10:45 +02:00
Laurent Destailleur
361fc53685
FIX div not balanced
2019-07-19 17:47:54 +02:00
Regis Houssin
cbda42d146
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-07-19 09:37:34 +02:00
Laurent Destailleur
50480bf517
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/opensurvey/index.php
2019-07-18 18:23:24 +02:00
Laurent Destailleur
f44182c89f
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-07-16 00:13:52 +02:00
Regis Houssin
294bc5dcb5
FIX avoid conflict with "$classname" in card.php
2019-07-15 10:19:06 +02:00
Maxime Kohlhaas
9c47cb6f91
NEW : can choose lines while creating order from origin
2019-07-08 23:16:32 +02:00
Laurent Destailleur
0a7d70829f
Translation of some comments
2019-07-05 21:37:25 +02:00
Laurent Destailleur
7de92070d7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/contrat/card.php
htdocs/contrat/class/contrat.class.php
2019-06-29 16:46:16 +02:00
Laurent Destailleur
adb3062a9f
Work on nblignes -> nblines
2019-06-29 16:38:14 +02:00
ptibogxiv
174e531d69
Update commande.class.php
2019-06-25 18:12:16 +02:00
ptibogxiv
9e88bf1f1c
NEW multilangs in fetch_lines
2019-06-25 15:41:20 +02:00
Laurent Destailleur
fa476b4994
Properties ->libelle_incoterms were renamed into ->label_incoterms
2019-06-25 13:00:02 +02:00
Laurent Destailleur
5675e7c50e
Clean code of deprecated method
2019-06-22 18:19:40 +02:00
Nicolas ZABOURI
2e4db8c83c
Merge remote-tracking branch 'Dolibarr/10.0' into MissingHook
2019-06-19 08:39:05 +02:00
ICstage
820c420ae5
FIX Missing hooks
2019-06-18 14:07:52 +02:00
Laurent Destailleur
a74eaaff4d
Fix sort of linked elements
2019-06-17 15:54:54 +02:00
Regis Houssin
6597c9f60d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-06-17 06:45:08 +02:00
ptibogxiv
651f4158ac
Fix add / delete contact access
2019-06-16 14:18:26 +02:00
ptibogxiv
70d9d3ab4c
FIX contact default list with adding job/function
...
as my last commit it's same contact but différent job / function. More clear for choosing right contact in the list (PR from my dolibarr's customer)
2019-06-04 18:23:25 +02:00
Regis Houssin
38246b4088
NEW add new function "setEntity()"
2019-06-03 11:13:26 +02:00
Regis Houssin
7b8b1a9052
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-06-03 11:04:28 +02:00
Laurent Destailleur
2218994958
FIX Duplicate encoding on error message
2019-05-29 09:51:45 +02:00
Lionel VESSILLER
1c1b3c376e
Fix check if order line is not in a shipment line before deleting
2019-05-23 15:57:02 +02:00
Regis Houssin
4f2f23f522
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-05-22 08:45:31 +02:00
Laurent Destailleur
22e897b1a1
Clean and prepare code to fix a SQL injection
2019-05-21 17:22:38 +02:00
Regis Houssin
2cf630c213
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-05-20 16:10:47 +02:00
Laurent Destailleur
11fea03074
Merge pull request #11026 from atm-john/new_look_and_feel_title_button
...
NEW : look and feel title button
2019-05-18 16:04:47 +02:00
florian HENRY
02af7ca25e
fix pb with multicompny payment dictionnary on faxcture card
2019-05-18 12:11:28 +02:00
Francis Appels
a2d4a59321
Merge branch 'develop' into clean_10_beta
2019-05-13 21:27:13 +02:00
Laurent Destailleur
5876582030
Fix responsive
2019-05-12 15:56:29 +02:00
Regis Houssin
b73df2698d
FIX better compatibility with Multicompany
2019-05-12 14:25:41 +02:00
Laurent Destailleur
3def11d5c9
Standardize translation
2019-05-10 19:32:46 +02:00
Laurent Destailleur
9de0e69456
FIX column project into list
2019-05-10 15:11:06 +02:00
Laurent Destailleur
5625c94c44
Fix missing label on project tooltip
2019-05-10 14:40:15 +02:00
Laurent Destailleur
0e8184332e
Fix missing label on project tooltip
2019-05-10 14:39:05 +02:00
Laurent Destailleur
a94c291b76
Dolibarization
2019-05-09 16:59:06 +02:00
Francis Appels
18c5c586ab
Cleanup set_draft in syslog
2019-05-01 09:38:27 +02:00
Laurent Destailleur
091132de2f
Signatures of methods createFromClone() has been standardized. All
...
methods requires the object User as first parameter.
2019-04-25 12:11:32 +02:00
Laurent Destailleur
f45462b409
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
2019-04-17 10:39:49 +02:00
Laurent Destailleur
e6ffaeefe5
CSS
2019-04-17 10:39:30 +02:00
ATM john
292d9c38a5
Appli function to links
2019-04-15 00:21:58 +02:00
Francis Appels
d08db86ba1
Fix customer order updateline
2019-04-11 18:55:16 +02:00
Laurent Destailleur
d7f980fda0
NEW Add picto of deletion on mass action combo lists
2019-04-09 01:22:59 +02:00
Laurent Destailleur
7b01e76d2b
Fix doxygen
2019-04-08 16:04:15 +02:00
Laurent Destailleur
917b9d69fa
Removed the method 4 of GETPOST (to get $_COOKIE). It was not used and
...
not recommanded to use in Dolibarr.
2019-04-08 14:55:31 +02:00
Laurent Destailleur
31963be6a0
Merge pull request #10922 from altatof/cloneorder
...
clone of order like in propal (ref_client, contacts)
2019-03-31 18:25:48 +02:00
Laurent Destailleur
361254a4c0
Fix regression after renamind valdate_invoices
2019-03-31 18:23:54 +02:00
Laurent Destailleur
1b2826f476
Look and feel v10
2019-03-29 13:26:26 +01:00
Christophe Battarel
631be04d5d
better clone oldline and avoid emptylabel on update
2019-03-27 12:15:50 +01:00
Christophe Battarel
3006e2bf75
memorize line before delete (for triggers)
2019-03-27 12:05:42 +01:00
Christophe Battarel
c9b321ded4
add global conf to createfromclone
2019-03-27 10:32:40 +01:00
Christophe Battarel
f1548bd253
fix objfrom
2019-03-27 10:27:08 +01:00
Christophe Battarel
9efb1b9525
copy internal and external contacts when cloning like in propal
2019-03-27 10:09:45 +01:00
Christophe Battarel
1b9cdd021a
test constant for keeping customer ref on clone of order like in propal
2019-03-27 10:00:29 +01:00
Laurent Destailleur
a34f4c2806
Merge pull request #10909 from IonAgorria/fix-line-dates
...
FIX: Disallow line start date after end date
2019-03-26 19:43:11 +01:00
Laurent Destailleur
f27f65e8bf
Responsive
2019-03-25 10:09:02 +01:00
Ion
7bfa49b29c
FIX: Disallow line start date > end date
2019-03-24 14:30:00 +01:00
Laurent Destailleur
20f3af066c
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/tva/clients.php
2019-03-23 22:44:14 +01:00
Laurent Destailleur
5666fbedac
FIX If we build one invoice for several orders, we must put the ref of
...
order on the line to not lose information.
2019-03-23 22:30:52 +01:00
Laurent Destailleur
28fede950f
Hidden option CHANGE_ORDER_CONCAT_DESCRIPTION were renamed into
...
MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION
2019-03-22 13:00:48 +01:00
Laurent Destailleur
a7181750c6
Merge pull request #10879 from altatof/noconcatdesc
...
NEW : add constant NO_CONCAT_DESCRIPTION
2019-03-22 12:56:46 +01:00
Philippe GRAND
b8d04fa076
translation
2019-03-22 09:43:12 +01:00
Laurent Destailleur
930720decd
WIP Start to replace use of property ->brouillon
2019-03-21 18:13:51 +01:00
Laurent Destailleur
90df30e412
NEW Add trigget FICHINTER_UNVALIDATE
...
Standardize code of setDraft.
2019-03-21 17:37:56 +01:00
Laurent Destailleur
5d21547854
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/product/price.php
htdocs/user/perms.php
2019-03-21 12:20:24 +01:00
Laurent Destailleur
41c737a213
Fix, Oops, test was inverted
2019-03-18 20:16:19 +01:00
Laurent Destailleur
aa013ff753
Fix do we really must copy notes when creating an object from another
...
source object? Add a hack with hidden option to be able to change this.
2019-03-18 20:09:09 +01:00
Christophe Battarel
8b3fd2eacf
NEW : add constant NO_CONCAT_DESCRIPTION
2019-03-18 16:10:17 +01:00
Philippe GRAND
c13a1dbc63
translation
2019-03-18 13:45:24 +01:00
Laurent Destailleur
7cdfff7263
Fix syntax error
2019-03-15 20:42:49 +01:00
Laurent Destailleur
c0b6699b25
All methods set_draft() were renamed into setDraft()
2019-03-15 19:01:40 +01:00
Laurent Destailleur
a2d6723ff3
WIP Link files to expense report lines
2019-03-15 15:07:52 +01:00
Laurent Destailleur
cdf6e4b65a
Fix some PSR rules
2019-03-14 16:43:27 +01:00
Laurent Destailleur
eeafc3c630
Standardize translation of amount
2019-03-13 14:10:36 +01:00
Laurent Destailleur
98ca9bf17a
Reduce quantity of string to translates
2019-03-12 19:44:59 +01:00
Joan Louis
f326c75be7
Update call to extrafields from cards
2019-03-11 21:34:16 +01:00
Laurent Destailleur
e913f1919f
Merge pull request #10803 from joanlouis/fix-extrafields-calls-from-cards
...
Update call to extrafields from cards
2019-03-11 21:14:53 +01:00
Joan Louis
ee5753819e
Update call to extrafields from cards
2019-03-11 14:22:04 +01:00
John BOTELLA
97544e0aea
add new dolGetStatus to LibStatut in common invoice class
2019-03-07 15:24:11 +01:00
John BOTELLA
ca10b1e403
add new dolGetStatus to LibStatut in product class
2019-03-07 11:37:54 +01:00
John BOTELLA
5ea5d51247
Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status
2019-03-07 09:41:03 +01:00
Laurent Destailleur
401ad65975
Fix API explorer was broken due to corrupted API
2019-03-06 18:04:36 +01:00
John BOTELLA
5fd3a253ab
add new dolGetStatus to LibStatut in order class
2019-03-06 14:19:40 +01:00
Frédéric FRANCE
f283782445
change visibility
2019-03-04 19:57:46 +01:00
Laurent Destailleur
4f9981063f
Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing
2019-03-02 18:26:50 +01:00
Laurent Destailleur
56d921ea52
CSS
2019-03-02 12:57:07 +01:00
Frédéric FRANCE
796ea6f4ea
add visibility
2019-02-28 23:19:58 +01:00
Frédéric FRANCE
7e31ca48d8
add visibility
2019-02-28 22:07:48 +01:00
Frédéric FRANCE
81f2f99db5
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
2019-02-26 21:16:01 +01:00
Laurent Destailleur
3ec2338c2d
Look and feel v10
2019-02-26 19:37:32 +01:00
Frédéric FRANCE
42a1387218
wip
2019-02-25 00:56:48 +01:00
ptibogxiv
25d4be0772
Update commande.class.php
2019-02-20 12:29:47 +01:00
Frédéric FRANCE
2ede3c1a40
Update list.php
2019-02-14 19:04:07 +01:00
ptibogxiv
58a73e7b4c
Update api_orders.class.php
2019-02-14 00:42:00 +01:00
ptibogxiv
7ac47fabda
NEW link/delete contact in order object
2019-02-14 00:36:35 +01:00
Laurent Destailleur
a39b4bcb7d
Update api_orders.class.php
2019-02-13 16:39:45 +01:00
Jimmy L
a172ea00a4
Rest API: Proposal, Orders, Invoices: Add contact details
2019-02-12 17:54:59 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature
2019-02-10 10:45:49 +01:00
Philippe GRAND
71e99e0972
update with html5 compliant code
2019-02-04 10:42:40 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma
2019-01-30 18:27:35 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
Laurent Destailleur
f30a3d59ba
Merge branch 'develop' into toomanylines
2019-01-27 17:59:13 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing
2019-01-27 15:20:16 +01:00
Frédéric FRANCE
496fa9b0fb
PSR2.Files.EndFileNewline.TooMany
2019-01-27 14:10:35 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged
2019-01-27 10:49:34 +01:00
Philippe GRAND
540e6d6f79
update with html5 compliant code
2019-01-23 17:34:30 +01:00
Laurent Destailleur
844643c37d
Merge pull request #10375 from grandoc/new_branch_19_01_2019
...
update with html5 compliant code
2019-01-20 19:48:32 +01:00
Laurent Destailleur
300889f53a
# WARNING: head commit changed in the meantime
...
Fix
2019-01-19 13:22:38 +01:00
Laurent Destailleur
2bbaae88d6
Fix standardize 'createfromclone' param when cloning
2019-01-19 12:46:38 +01:00
Philippe GRAND
336be085f6
update with html5 compliant code
2019-01-19 12:28:18 +01:00
Laurent Destailleur
5130019003
css
2019-01-17 19:27:26 +01:00
Philippe GRAND
1a55d5fe85
update with html5 compliant code
2019-01-17 14:27:07 +01:00
ldestailleur
bc00fb177a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-02 19:42:15 +01:00
ldestailleur
3af418349a
FIX Can't empty the payment mode
2018-12-29 07:54:30 +01:00
Laurent Destailleur
b511a056f4
Fix phpcs
2018-12-15 11:48:21 +01:00
Laurent Destailleur
baf9b6f309
Fix regression (bad name of function)
2018-12-14 19:21:19 +01:00
Laurent Destailleur
38ddfd9a62
Merge pull request #10152 from defrance/patch-134
...
refactoring list.php with dol_sql_datefilter
2018-12-14 19:06:29 +01:00
Laurent Destailleur
3571eaee3d
Merge branch 'develop' into NEW_change_order_concat_desc
2018-12-14 17:44:08 +01:00
Laurent Destailleur
9fb672d51b
Merge pull request #10127 from atm-florian/develop_scrunitizer
...
fix scrunitizer
2018-12-14 17:28:34 +01:00
Laurent Destailleur
2011afe6fb
Merge branch 'develop' into actionrefused
2018-12-14 15:48:24 +01:00
Laurent Destailleur
83efdee7d3
Merge branch 'develop' into new_mass_generate
2018-12-14 15:44:46 +01:00
Laurent Destailleur
611ccc4a9a
Merge branch 'develop' into fieldlabel
2018-12-14 15:42:01 +01:00
Laurent Destailleur
233e160489
Merge pull request #9874 from atm-john/New_import_lines_from_linked_element_step2
...
NEW Extend import option to Order's card and Propal's card
2018-12-14 15:29:27 +01:00
Laurent Destailleur
f97b561af0
Merge branch 'develop' into qual_rename_facnumber
2018-12-13 20:24:12 +01:00
Laurent Destailleur
138640fc63
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/contrat/class/contrat.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
2018-12-04 14:58:11 +01:00
Laurent Destailleur
8e333c3feb
Standardize code
2018-12-04 14:54:58 +01:00
Laurent Destailleur
d80baaea69
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/contrat/class/contrat.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
2018-12-04 14:29:47 +01:00
Ferran Marcet
7247b14bd9
FIX Lines are not inserted correctly if VAT have code
2018-12-03 12:28:17 +01:00
Ferran Marcet
8312d57d16
FIX Lines are not inserted correctly if VAT have code
2018-12-03 11:58:39 +01:00
Maxime Kohlhaas
2e496ea83a
QUAL rename facnumber by ref
2018-12-02 17:33:44 +01:00
BENKE Charlene
0d35f04cb7
Update list.php
2018-12-01 23:36:26 +01:00
florian HENRY
d928372239
fix https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/commande/class/commande.class.php?selectedAuthors%5B0%5D=florian.henry%40atm-consulting.fr&orderField=path&order=asc&honorSelectedPaths=0
2018-12-01 14:51:22 +01:00
Laurent Destailleur
0367795488
Fix auto jump on record if only 1 record in a search
2018-11-27 11:09:47 +01:00
Thibault Descamps
c2e5a29246
NEW redirect if only one result on global search on card
2018-11-22 11:36:30 +01:00
Thibault Descamps
1cc130e5f6
NEW : conf to change concat desc order
2018-11-21 09:57:44 +01:00
JC Prieto
deff4ca4a0
Update list.php
...
Missing the following lines to search total_ttc
2018-11-19 20:03:36 +01:00
Laurent Destailleur
2f87ee6640
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-19 15:56:38 +01:00
Laurent Destailleur
f85ab8d0a6
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/comm/propal/card.php
2018-11-19 15:55:41 +01:00
Frédéric FRANCE
12dcda7e02
Merge remote-tracking branch 'upstream/develop' into fieldlabel
2018-11-15 22:01:36 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused
2018-11-13 21:40:17 +01:00
gauthier
66ea8bbe87
FIX : fourn payment modes musn't be available on customer docs
2018-11-12 15:58:41 +01:00
Frédéric FRANCE
09efde4901
Merge remote-tracking branch 'upstream/develop' into fieldlabel
2018-11-09 18:13:59 +01:00
Regis Houssin
89389baeac
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email
2018-11-09 15:37:29 +01:00
Laurent Destailleur
3e844db74f
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fichinter/stats/index.php
2018-11-08 20:19:28 +01:00
John BOTELLA
98548337ae
FIX supplier order list keep socid
2018-11-08 15:38:25 +01:00
Laurent Destailleur
66ffcf287a
Fix filter on extrafields
2018-11-07 12:49:17 +01:00
Laurent Destailleur
4a25317f10
Fix security on GETPOST('action'). Param must be sanitized.
2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e
FIX sanitize param $action
2018-11-05 17:53:31 +01:00
Frédéric FRANCE
da3ee9ad9a
Merge remote-tracking branch 'upstream/develop' into fieldlabel
2018-10-30 19:04:35 +01:00
Regis Houssin
9589f69574
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_email
Conflicts:
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
2018-10-30 18:29:28 +01:00
Laurent Destailleur
68f6ebd0ff
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/lib/security.lib.php
htdocs/modulebuilder/template/myobject_card.php
2018-10-30 14:47:39 +01:00
Laurent Destailleur
afe61579e8
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-10-30 14:29:26 +01:00
Laurent Destailleur
b0ef8680ff
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-10-30 14:28:25 +01:00
Frédéric FRANCE
c92a2084f1
remove fieldlabel and add fieldeditkey
2018-10-27 14:50:27 +02:00
Regis Houssin
569d59d251
FIX change my deprecated email
2018-10-27 14:43:12 +02:00
Frédéric FRANCE
9c7ec434b7
remove fieldlabel and add fieldeditkey
2018-10-27 13:48:30 +02:00
Frédéric FRANCE
d67c40dffe
remove fieldlabel and add fieldeditkey
2018-10-27 13:01:01 +02:00
Frédéric FRANCE
f29ee25ea7
remove fieldlabel and add fieldeditkey
2018-10-27 11:06:45 +02:00
Frédéric FRANCE
a30091fd74
Update commande.class.php
2018-10-27 09:51:19 +02:00
Laurent Destailleur
852b069785
Fix reponsive in stats pages
2018-10-26 15:46:17 +02:00
atm-john
759b2b6ccf
Extend import option to Order's card and Propal's card
2018-10-25 21:39:22 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
2018-10-24 23:04:26 +02:00
Laurent Destailleur
01adaf253c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/product/list.php
2018-10-24 03:35:44 +02:00
Laurent Destailleur
c8aa884462
Fix search all
2018-10-23 17:16:46 +02:00
Laurent Destailleur
5f309bf155
Update commande.class.php
2018-10-19 13:38:23 +02:00
ptibogxiv
7c35eae202
Update commande.class.php
2018-10-17 00:06:24 +02:00
ptibogxiv
27b7cf8bea
Fix uniformization dates of order in API
2018-10-16 23:31:19 +02:00
Maxime Kohlhaas
d4d921b1cc
Add massaction generate on main lists
2018-10-14 16:27:59 +02:00
Philippe GRAND
af0bcb2631
Standardize code
2018-10-09 09:40:00 +02:00
Laurent Destailleur
b3b2305651
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/lib/pdf.lib.php
2018-10-04 17:56:56 +02:00
Laurent Destailleur
13759ea146
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
2018-10-04 17:53:40 +02:00
aplose
8ee7a48583
Fix issue #9434 : no array_options available when calling api :
...
I replace the deprecated code by the fetch_optionnals() recommanded call.
2018-10-03 15:15:46 +02:00
Laurent Destailleur
26d20d0b76
Merge pull request #8729 from atm-quentin/NEW_rights_ignoring_min_price
...
NEW Advanced permission to ignore price min
2018-09-27 09:57:49 +02:00
Laurent Destailleur
ab0f842db6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-16 12:55:44 +02:00
Laurent Destailleur
74a9c680df
FIX "Other ..." link so the "Back to" link works.
2018-09-16 12:27:56 +02:00
Frédéric FRANCE
987fdbe73c
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-12 21:29:41 +02:00
Frédéric FRANCE
3e71f4e6b0
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-12 18:36:49 +02:00
Frédéric FRANCE
998b67fa98
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-12 18:32:15 +02:00
Laurent Destailleur
fcabe67e4b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-12 13:30:28 +02:00
Frédéric FRANCE
f02b2f0239
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-09 13:35:58 +02:00
Frédéric FRANCE
a3fa13994b
replace select_date
2018-09-09 09:36:12 +02:00
Frédéric FRANCE
2b62c4ca8f
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-08 10:50:27 +02:00
Laurent Destailleur
ff05997f0a
FIX Several fixes on the management of minimal amount for orders
2018-09-06 17:37:02 +02:00
Philippe GRAND
3c06527a7b
Merge remote-tracking branch 'upstream/develop' into new_branch_03_09_2018
2018-09-06 09:50:12 +02:00
Frédéric FRANCE
4cbfa2073a
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-05 21:02:16 +02:00
Laurent Destailleur
4ac67e6409
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-05 20:31:10 +02:00
Frédéric FRANCE
4e619dd0ed
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-05 18:51:21 +02:00
Laurent Destailleur
f1cb13634b
FIX Entering negative price on order
2018-09-05 14:55:45 +02:00
Philippe GRAND
38ca6096b2
Standardize and update code
2018-09-05 10:31:12 +02:00
Laurent Destailleur
ab8155f170
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/card.php
htdocs/filefunc.inc.php
2018-09-04 21:35:43 +02:00
Frédéric FRANCE
65b74ad30f
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-04 20:48:35 +02:00
Frédéric FRANCE
bdcac95761
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-04 15:15:23 +02:00
Philippe GRAND
0492492df1
fix merge
2018-09-04 12:30:06 +02:00
Laurent Destailleur
3ef808cb9b
Fix #9302 MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES broken
2018-09-04 11:23:28 +02:00
Laurent Destailleur
3d50c454c1
Code comment
2018-09-03 17:05:44 +02:00
Philippe GRAND
3de16a145e
Standardize and update code
2018-09-02 11:08:41 +02:00
Frédéric FRANCE
e98b8e5e25
move phpcs:ignore
2018-09-02 09:27:59 +02:00
Philippe GRAND
5d273960dc
fix conflict
2018-09-01 22:40:38 +02:00
Laurent Destailleur
c8912d6a4f
Merge pull request #9242 from frederic34/camelCaps
...
mark non camelCaps function
2018-09-01 15:37:56 +02:00
Philippe GRAND
f77dd2ebc7
Standardize and update code
2018-09-01 15:13:59 +02:00
Philippe GRAND
c013f9cf3d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2018-09-01 15:13:04 +02:00
Laurent Destailleur
c2548b8b39
Merge pull request #9298 from ksar-ksar/Upd_hook_formConfirm
...
NEW hook formConfirm always called if hooked
2018-09-01 14:50:08 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-09-01 13:52:51 +02:00
Philippe GRAND
7354e485b0
precise label comment
2018-09-01 13:22:08 +02:00
ksar-ksar
49d3bea192
Remove the test
...
After discussion with Frederic, the best solution is to remove the test
2018-08-30 11:27:48 +02:00
Frédéric FRANCE
5100b8b7b0
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-30 10:42:47 +02:00
Frédéric FRANCE
57207794c2
tabs added
2018-08-30 10:30:52 +02:00
Frédéric FRANCE
1bdc33f286
tabs added
2018-08-30 10:02:31 +02:00
Frédéric FRANCE
4196febb67
tabs added
2018-08-30 09:40:04 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration
2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace
2018-08-29 21:25:22 +02:00
Laurent Destailleur
a5a629fd0f
Fix phpcs
2018-08-29 17:44:44 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-28 09:34:53 +02:00
Laurent Destailleur
7219bac0b2
Merge pull request #9168 from frederic34/trimtrailing
...
Trimtrailing
2018-08-28 02:30:02 +02:00
ksar-ksar
a844855ade
Update hook formConfirm
...
The hook should be called when the $formconfirm is not empty
2018-08-24 16:40:26 +02:00
Philippe GRAND
2fa82edd39
Standardize and update code
2018-08-23 17:07:27 +02:00
Philippe GRAND
449ef9c464
Update and standardize code
2018-08-22 18:12:44 +02:00
Philippe GRAND
95349365ba
Update and standardize code
2018-08-22 11:39:37 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-21 20:57:58 +02:00
Frédéric FRANCE
aba69b94b2
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-21 14:03:02 +02:00
Laurent Destailleur
0799970804
Merge pull request #9248 from frederic34/FunctionDeclaration
...
function declaration
2018-08-21 13:41:56 +02:00
Laurent Destailleur
85eed6cf80
Merge branch 'develop' into trimtrailing
2018-08-21 13:40:04 +02:00
Laurent Destailleur
289f194641
Merge pull request #9058 from defrance/patch-123
...
New : Add total price on dashboard
2018-08-21 13:33:33 +02:00
Frédéric FRANCE
7bb781eea8
function declaration
2018-08-15 14:28:34 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function
2018-08-13 17:26:32 +02:00
Frédéric FRANCE
82e8efe792
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 20:14:14 +02:00
Laurent Destailleur
9fc5d39d07
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-12 20:09:36 +02:00
Laurent Destailleur
dc8c4402ee
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-12 20:09:22 +02:00
Laurent Destailleur
0a1c6e7194
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/compta/facture/list.php
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
2018-08-12 20:08:20 +02:00
Frédéric FRANCE
62db9a4022
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 19:54:03 +02:00
Laurent Destailleur
2d571acc03
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/commande/list.php
2018-08-12 19:25:44 +02:00
Laurent Destailleur
30b4d88428
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/product/reassort.php
htdocs/societe/list.php
2018-08-12 19:23:45 +02:00
Frédéric FRANCE
6f74ecceaf
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 18:21:59 +02:00
Laurent Destailleur
2f559a7edb
Merge pull request #9199 from atm-quentin/FIX_hook_update_price
...
NEW Add hook changeRoundingMode in update_price
2018-08-12 18:17:52 +02:00
Laurent Destailleur
3d4d42462c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-08-12 16:30:21 +02:00
Laurent Destailleur
12e21b4886
FIX update extrafields
2018-08-12 16:29:26 +02:00
Frédéric FRANCE
62b83412ee
test phpcs v3
2018-08-09 11:31:48 +02:00
Laurent Destailleur
61d7629ab1
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
2018-08-08 17:44:22 +02:00
Laurent Destailleur
8d54df4263
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
2018-08-08 17:31:23 +02:00
Frédéric FRANCE
9025c452ef
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-07 16:40:03 +02:00
Philippe GRAND
948647f3f9
comment translation
2018-08-04 14:17:51 +02:00
atm-quentin
6662bf05ba
FIX hook on update price AND fix id on line
2018-08-03 11:47:43 +02:00
Philippe
61e1f0508d
FIX : Search on Ref project on order list
2018-08-03 11:08:09 +02:00
Juanjo Menent
b8efe3b239
Merge pull request #9172 from grandoc/new_branch_28_07_2018
...
standardize
2018-08-02 11:27:02 +02:00
Philippe GRAND
fb565b15c5
standardize
2018-07-29 19:16:28 +02:00
Frédéric FRANCE
c991a4d204
trim trailing
2018-07-26 18:05:20 +02:00
Frédéric FRANCE
0952cf5e2b
fix no link in order list
2018-07-26 10:43:50 +02:00
Philippe GRAND
2a6f050e32
Clean and update code
2018-07-24 18:28:56 +02:00
Laurent Destailleur
387abf2da8
Merge pull request #9057 from inoveaconseil/checkRightOnLink
...
ADD Check right on link
2018-07-16 09:31:21 +02:00
Laurent Destailleur
f3b7bc53bd
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/tpl/extrafields_list_print_fields.tpl.php
2018-07-15 20:16:08 +02:00
gauthier
80ff7fa86f
FIX : case when we valid form with keyboard
2018-07-11 15:18:30 +02:00
gauthier
103c7e6d06
FIX : page must always be 0 when we search (to avoid case : when we're on page 3 and we're looking for a precise thirdparty, we stay on page 3 and nothing's displaied)
2018-07-11 09:51:36 +02:00
Laurent Destailleur
bda142d82d
Update commande.class.php
2018-07-10 11:10:55 +02:00
BENKE Charlene
5a6cfd5efe
Update commande.class.php
2018-07-05 12:08:59 +02:00
Inovea Conseil
30cff2bb36
ADD check user's rights
2018-07-05 11:52:41 +02:00
Laurent Destailleur
cfb41d4329
FIX: If module workflow disabled, we must disable autoclassification too
2018-07-03 11:43:50 +02:00
Regis Houssin
26495fb698
Fix: !!!! Dont't use entity if you use rowid in fetch or others !!!!
2018-07-01 18:49:37 +02:00
Regis Houssin
4925624ed9
Fix: avoid NULL value when "subprice" is 0
2018-06-30 10:38:30 +02:00
Laurent Destailleur
da138db528
FIX combo into popup become crazy with IE10
...
Conflicts:
htdocs/asset/card.php
htdocs/modulebuilder/template/myobject_card.php
2018-06-28 12:16:12 +02:00
Laurent Destailleur
3ea2d81279
FIX combo into popup become crazy with IE10
2018-06-28 12:05:02 +02:00
Laurent Destailleur
af9d2c3b5a
Merge pull request #9008 from grandoc/new_branch_22_06_2018
...
clean and update code
2018-06-24 13:47:26 +02:00
Laurent Destailleur
27a27e02a1
Fix css
2018-06-22 22:53:53 +02:00
Philippe GRAND
afda5288a8
clean and update code
2018-06-22 16:27:11 +02:00
Laurent Destailleur
edd7499375
Fix clone with new architecture
2018-06-19 09:21:23 +02:00
Inovea Conseil
d5a3e63e05
Fix missing paramater for generateDocument
2018-06-15 09:47:28 +02:00
Laurent Destailleur
910652eb6d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/langs/en_US/admin.lang
2018-06-13 23:07:30 +02:00
Laurent Destailleur
4c2af6fc70
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/class/html.form.class.php
2018-06-13 23:04:08 +02:00
Laurent Destailleur
4a5fd35e11
Look and feel v8
2018-06-13 22:57:41 +02:00
altatof
d42f00bca9
FIX : pu_ht_devise was not converted to numeric so decimals were lost
...
when clculating total_ht_devise
2018-06-13 16:35:52 +02:00
Laurent Destailleur
c1f5c6becf
Merge pull request #8877 from frederic34/longlines
...
soft limit length of lines to 500 chars
2018-05-30 11:19:29 +02:00
Laurent Destailleur
323bf6ef1f
Merge pull request #8873 from frederic34/loadlangs
...
loadlangs
2018-05-29 10:07:10 +02:00
Laurent Destailleur
f83dedf1b0
Fix space/tab
2018-05-29 10:04:20 +02:00
Neil Orley
748be12da2
Get external contacts ids instead of BILLING contacts ids.
2018-05-28 09:42:24 +02:00
Neil Orley
4ad1f81ea9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2018-05-28 09:30:21 +02:00
Frédéric FRANCE
e2a557aadd
limit length of lines to 500 chars
2018-05-27 15:04:12 +02:00
Frédéric FRANCE
30a3b95368
loadlangs
2018-05-26 20:32:23 +02:00
Frédéric FRANCE
f53f7bbf40
loadlangs
2018-05-26 18:41:16 +02:00
Frédéric FRANCE
0a90f2d690
loadlangs
2018-05-26 15:50:03 +02:00
Frédéric FRANCE
091fb81368
Update list.php
2018-05-26 09:49:13 +02:00
Laurent Destailleur
182abfdb5b
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/societe/card.php
2018-05-25 15:02:24 +02:00
Laurent Destailleur
8a64ee2297
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/commande/list.php
htdocs/compta/facture/card.php
htdocs/compta/facture/list.php
htdocs/expedition/class/expedition.class.php
htdocs/expedition/list.php
htdocs/societe/card.php
2018-05-25 13:14:58 +02:00
Laurent Destailleur
823936ef87
Merge pull request #8847 from frederic34/multipriceqty
...
NEW Finish implementation of option PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES
2018-05-25 12:55:02 +02:00
Philippe GRAND
11b63325bf
clean and update code
2018-05-24 10:48:03 +02:00
atm-quentin
eb224e43a5
FIX missing filters during ordering
2018-05-24 10:41:24 +02:00
Frédéric FRANCE
8547827575
Merge remote-tracking branch 'upstream/develop' into multipriceqty
2018-05-23 17:06:02 +02:00
Frédéric FRANCE
efbb053e54
PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES
2018-05-23 17:05:08 +02:00
Neil Orley
15e02c7082
NEW : adds billing contacts ids to REST API returns
...
adds billing contacts ids to REST API returns for proposals, orders and invoices
2018-05-22 11:40:32 +02:00
Laurent Destailleur
de84f0e687
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/core/actions_massactions.inc.php
htdocs/filefunc.inc.php
2018-05-21 23:35:09 +02:00
Laurent Destailleur
6d0306f75a
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/class/html.formfile.class.php
2018-05-18 11:52:48 +02:00
Laurent Destailleur
492b1e7169
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2018-05-18 11:48:08 +02:00
Juanjo Menent
dc7a1610e7
Fix: extrafiels is not passing orders to invoice
2018-05-17 18:56:01 +02:00
atm-quentin
8cd6c72a2f
NEW advanced rights
2018-05-07 10:04:43 +02:00
Laurent Destailleur
7511ba52ae
NEW Suggest link to pay online for customer orders
2018-05-05 22:20:33 +02:00
Laurent Destailleur
546da0ceda
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/core/modules/modStock.class.php
htdocs/product/inventory/list.php
2018-05-05 14:40:39 +02:00
Laurent Destailleur
86697c58d8
Merge pull request #8712 from atm-quentin/develop_categ_filter
...
NEW thirdparty categ filter on lists
2018-05-05 12:56:27 +02:00
atm-quentin
ec5e84075e
NEW Rights to ignore price min
2018-05-03 10:18:38 +02:00
atm-quentin
21b387a4c4
NEW thirdparty categ filter on lists
2018-05-02 15:01:32 +02:00
atm-quentin
a20ec7ba1e
NEW cancel orders on massaction
2018-05-02 14:37:35 +02:00
Laurent Destailleur
3340598cf8
FIX Projet is not prefilled when created from overwiew page
2018-05-01 14:15:11 +02:00
Laurent Destailleur
3374c50e2d
CSS
2018-05-01 10:42:09 +02:00
Laurent Destailleur
82a8513aed
Standardize code
2018-04-29 19:52:14 +02:00
Laurent Destailleur
461ae46cc4
FIX When on a high page and searching for a small result, list was not
...
visible.
2018-04-24 11:37:57 +02:00
Laurent Destailleur
bbfc4a3e17
NEW Look and feel v8 - Show Picto "+" on all links "Add record"
2018-04-18 03:26:15 +02:00
Laurent Destailleur
0d0da234b1
Lowercase NULL, TRUE, FALSE according to PSR2
2018-04-16 13:51:16 +02:00
Laurent Destailleur
8fbde88872
Look and feel v8
2018-04-15 17:37:49 +02:00
Laurent Destailleur
be965bdbab
Clean code
2018-04-13 13:28:48 +02:00
Laurent Destailleur
1521b0595b
Clean code
2018-04-13 11:03:03 +02:00
All-3kcis
880fa55dd5
display user-friendly filesize
2018-04-12 15:29:22 +02:00
Laurent Destailleur
7108f68db9
Remove old deprecated hook insertExtraFields. Triggers must be used for
...
action on CRUD events.
2018-04-10 12:03:01 +02:00
Laurent Destailleur
2d547abaa9
Merge pull request #8498 from atm-john/New_import_lines_from_linked_element
...
New import lines from linked element
2018-04-05 18:26:47 +02:00
John
57db0d2a16
Add hidden conf
2018-04-05 17:26:08 +02:00
Laurent Destailleur
9d9f3ddf85
Merge pull request #8502 from ATM-Marc/NEW_create_from_list
...
NEW: generalize use of button to create new element from list
2018-04-05 16:40:15 +02:00
John
d689e88b92
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element
2018-04-03 11:38:12 +02:00
Laurent Destailleur
43f8834b28
Uniformize code with the new module builder framework
2018-03-31 18:48:27 +02:00
Marc de Lima Lucio
0366e645d5
NEW: generalize button to create object from list, for most of the lists
2018-03-30 16:54:38 +02:00
Laurent Destailleur
72cedcf9f3
Removed method fetch_prods() and get_each_prod() not used, keep only
...
get_arbo_each_prod() that is better.
2018-03-22 18:01:06 +01:00
Laurent Destailleur
3b55049895
Dolibarrize module ticket
2018-03-22 10:23:25 +01:00
Laurent Destailleur
f46df6d8e5
Can resize and crop images in the ticketsup module
2018-03-19 11:49:05 +01:00
Laurent Destailleur
d4ae0395ed
NEW Look and feel v8: Use a different picto for delete and unlink
2018-03-18 19:13:42 +01:00
Laurent Destailleur
e639f2a91f
Removed deprecated method classer_facturee(). Duplicate of
...
classifyBilled
2018-03-16 10:51:12 +01:00
Laurent Destailleur
0258d3aeeb
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-13 18:04:59 +01:00
Laurent Destailleur
ca809a11af
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/commande/class/commande.class.php
2018-03-13 18:04:18 +01:00
Laurent Destailleur
dcd3387a30
Update commande.class.php
2018-03-13 09:53:21 +01:00
Laurent Destailleur
51229a602f
Update commande.class.php
2018-03-13 09:51:45 +01:00
atm-quentin
6c7a5cebdf
FIX check verif exped on delete order
2018-03-13 09:34:50 +01:00
Alexandre SPANGARO
c0d4ca3682
Fix : Remove two langs->load("sendings") and use loadLangs instead
2018-03-11 22:28:27 +01:00
Laurent Destailleur
93f4d6fdcd
Translation
2018-03-11 21:34:38 +01:00
Laurent Destailleur
64f21b8a3c
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/card.php
2018-03-11 00:10:13 +01:00
Romain DELVAL
ee55776886
FIX Duplicate product_type asignement on order addline
...
On addline order method, ther is a duplicate assignation on
line->product_type before call to "insert" method.
The second assignement always make product_type to "0" while it was
fetched from product himsel like it was made on first asignement few
lines above
2018-03-09 12:38:28 +01:00
Regis Houssin
ea175cd6c1
Fix: compatibility with multicompany dictionnary sharing
2018-03-09 09:37:23 +01:00
Laurent Destailleur
1c9e7145e7
Merge pull request #8276 from ATM-Consulting/develop_atm
...
NEW: supplier credit notes & discounts (absolute and relative)
2018-03-08 20:06:37 +01:00
Regis Houssin
93a9430e49
Fix: regression, restore primary key
2018-03-08 07:41:54 +01:00
Laurent Destailleur
317a5f5b2f
Fix by adding a redirect to avoid the order2billing being done twice.
2018-03-07 19:15:23 +01:00
Laurent Destailleur
64b0d1d390
Fix by adding a redirect to avoid the order2billing being done twice.
2018-03-07 14:33:29 +01:00
Laurent Destailleur
004839b368
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-03-07 13:03:40 +01:00
Marc de Lima Lucio
1765b09fda
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-03-05 11:05:38 +01:00
Marc de Lima Lucio
451d943927
NEW: supplier credit notes: factorized discount block (+ correct translations for supplier discounts)
2018-03-02 16:48:25 +01:00
Marc de Lima Lucio
7cd1b2caa9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-02-27 16:45:01 +01:00
ATM-Nicolas
a4ae700202
FIX : Avoid empty value to fk_multicurrency attribute
2018-02-27 11:11:32 +01:00
ATM-Nicolas
27100df927
FIX : Avoid empty value to fk_multicurrency attribute
2018-02-27 11:06:11 +01:00
Laurent Destailleur
0cc84ab92f
FIX Missing restore_lastsearch_values
2018-02-26 21:21:28 +01:00
Laurent Destailleur
3c552cec15
FIX Missing restore_lastsearch_values
2018-02-26 21:16:40 +01:00
Laurent Destailleur
003827eb06
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-25 15:01:19 +01:00
Laurent Destailleur
502f219f7f
Merge pull request #8231 from hregis/7.0_entity
...
FIX missing object entity in fetch
2018-02-25 12:59:38 +01:00
Regis Houssin
703d976b3b
Fix: missing object entity in fetch
2018-02-24 16:21:16 +01:00
Regis Houssin
b216249214
Fix: missing hook parameters
2018-02-24 15:01:29 +01:00
Laurent Destailleur
0a79550f43
Fix oldcopy must be saved before update_extras
2018-02-23 16:11:00 +01:00
John
a7a6630fad
Add popin dialog
2018-02-22 15:19:20 +01:00
John
f313fb925b
Add new checkbox for lines
2018-02-21 17:06:40 +01:00
Laurent Destailleur
b4446764f8
Clean code of deprecated usage
2018-02-21 14:48:25 +01:00
John
bd0e8506f5
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element
2018-02-21 11:53:16 +01:00
Laurent Destailleur
72c1357c9b
NEW Section of files generated by mass action not visible if empty
2018-02-21 11:02:45 +01:00
Laurent Destailleur
c4130730cb
Clean code around fetch_optionals()
2018-02-20 19:38:18 +01:00
Laurent Destailleur
809ef1bd00
FIX Trigger *_MODIFY must be called when editing a property event extra.
...
Clean duplicate trigggers "*_CLONE"
2018-02-20 18:09:38 +01:00
John
09c5dc506a
Add html dom element and fix class
2018-02-20 17:46:32 +01:00
John
5624257a6d
add new dom html5 elements and class
2018-02-20 16:49:49 +01:00
Marc de Lima Lucio
95be155010
FIX: supplier credit notes: harmonize discount filters
2018-02-20 12:26:29 +01:00
Marc de Lima Lucio
905adab517
NEW: supplier credit notes: display supplier discounts in supplier order card
2018-02-16 11:23:59 +01:00
Laurent Destailleur
475b89bac1
Merge branch 'develop' into new_order_min_amount
2018-02-08 14:20:53 +01:00
Laurent Destailleur
0cc6654b06
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
2018-02-04 13:25:00 +01:00
Laurent Destailleur
c6fba7273d
Api interventions
2018-02-03 20:58:26 +01:00
Laurent Destailleur
b3df7670e9
Merge pull request #7999 from frederic34/propalweight
...
NEW display weight volume in propal
2018-02-03 16:58:58 +01:00
Laurent Destailleur
6e446ccaae
Fix scrutinizer
2018-02-01 10:51:01 +01:00
Laurent Destailleur
89dc208072
Fix fk_account not into update
2018-01-30 17:00:17 +01:00
Maxime Kohlhaas
9899a02630
Display alert if order total is under order min amount
2018-01-20 20:17:56 +01:00
Laurent Destailleur
e4c02152b3
Fix navigation in bookeeping view grouped by account
2018-01-15 12:14:18 +01:00
Laurent Destailleur
3bcf1d9da6
Fix css
2018-01-13 12:08:24 +01:00
Laurent Destailleur
43d560830c
Fix on old php
2018-01-10 13:20:43 +01:00
Laurent Destailleur
9f79ad800b
Fix price per quantity
2018-01-09 14:20:47 +01:00
Laurent Destailleur
42e659e26c
Fix link for online payment
2018-01-08 13:21:04 +01:00
Laurent Destailleur
1e438b7ebd
Fix travis and return of api that change status
2018-01-05 02:01:57 +01:00
Laurent Destailleur
0fb95fa15f
Try a fix for #7778
2018-01-05 01:30:12 +01:00
Laurent Destailleur
f19fb90ab0
Merge #8008 manually
2018-01-04 23:36:14 +01:00
Frédéric FRANCE
33f6ba19da
display weight volume in propal
2017-12-28 16:20:08 +01:00
Laurent Destailleur
b0fefffcf8
Fix standardize api code
2017-12-28 12:44:15 +01:00
Laurent Destailleur
6676178435
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/list.php
htdocs/contrat/card.php
2017-12-28 09:56:40 +01:00
Laurent Destailleur
3ac413084f
Merge branch '6.0' into 6.0
2017-12-28 08:46:22 +01:00
Ferran Marcet
1c7b99d3dc
Fix: Missing include for Project class
2017-12-26 12:13:35 +01:00
Laurent Destailleur
aad0da2513
Fix maxi debug of APIs (clean output fields)
2017-12-21 16:50:18 +01:00
Laurent Destailleur
eab44f62b1
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_builddoc.inc.php
htdocs/core/class/html.form.class.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
htdocs/core/tpl/admin_extrafields_edit.tpl.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/core/tpl/notes.tpl.php
htdocs/main.inc.php
htdocs/product/inventory/tpl/inventory.tpl.php
htdocs/societe/tpl/linesalesrepresentative.tpl.php
2017-12-21 14:35:33 +01:00
Laurent Destailleur
6a62e13960
FIX security vulnerability reported by ADLab of Venustech
2017-12-21 13:32:16 +01:00
Laurent Destailleur
f1305bbdd6
Fix css
2017-12-20 21:14:22 +01:00
Neil Orley
171e388f6d
NEW Update bank account when updating an order
...
Add the ability to update the bankaccount when updating an order
2017-12-19 14:16:51 +01:00
Neil Orley
7e3a2d75bb
FIX Error when classify the order as invoiced unsing API
...
Remove of notrigger parameter. The notrigger attribute caused a type error when used.
2017-12-19 13:06:28 +01:00
Neil Orley
fe8fac9577
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api
2017-12-19 12:36:46 +01:00
Neil Orley
0817873267
NEW Create an order using an existing proposal
...
Create an order using an existing proposal.
2017-12-18 16:13:54 +01:00
Laurent Destailleur
1351a43a30
FIX Maxi debug of permission for users external or restricted to sales
...
representatives
2017-12-18 16:13:05 +01:00
Neil Orley
5ae74f8ae1
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api
2017-12-15 09:56:02 +01:00
Laurent Destailleur
af1028576d
Fix on search all (trim search + search from smartphone).
2017-12-12 11:31:30 +01:00
Laurent Destailleur
1251807f54
Fix several pb in links to projects on create page
2017-12-12 10:37:51 +01:00
Laurent Destailleur
bb7c03906e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
htdocs/societe/list.php
2017-12-11 15:25:09 +01:00
Laurent Destailleur
95cb5025a2
Fix length of month too large
...
More complete template
2017-12-08 16:15:41 +01:00
Laurent Destailleur
09d3db145b
Merge
2017-12-08 13:10:13 +01:00
Regis Houssin
1b16eb731d
Fix: missing load product translation file
2017-12-08 11:00:23 +01:00
Regis Houssin
1bdffa961f
Fix: wrong translation if multilang activated
2017-12-08 10:41:14 +01:00
Maxime Kohlhaas
8a39e2a413
Fix : no need for action button on cards, link is now available
2017-12-07 00:36:23 +01:00
Laurent Destailleur
ce32da6217
Fix debugs APIs
2017-12-01 15:39:18 +01:00
florian HENRY
94285ae494
factorization of extrafeild into list
2017-11-27 15:24:29 +01:00
Laurent Destailleur
77509ee37a
Removed deprecated apis
2017-11-25 13:14:28 +01:00
Laurent Destailleur
a5dda258cd
Fix scrutinizer
2017-11-25 12:18:23 +01:00
Laurent Destailleur
9f235e1ff6
Standardize database: field ref of warehouse was renamed label -> ref
2017-11-24 15:27:00 +01:00
Laurent Destailleur
9c22b5f335
Replace deprecated dol_print_graph with DolGraph
2017-11-23 20:24:05 +01:00
Laurent Destailleur
b93e35cdd2
Fix a lot of request to use the IN getentity instead of =
...
Fix a lot of request to use left join on type of payment table
2017-11-23 15:06:16 +01:00
Laurent Destailleur
80bdb45be8
Look and feel v6 - Show status of thirdparty in dol_banner
2017-11-18 01:48:16 +01:00
Laurent Destailleur
0d192df1fd
Standardize interface
2017-11-16 18:33:56 +01:00
Neil Orley
d97cf63a16
NEW Classify the order as invoiced in the REST API
...
Classify the order as invoiced
FIX variable name
2017-11-15 12:14:28 +01:00
Laurent Destailleur
f68b2bdeca
Use the confirmation when deleting from mass action everywhere.
2017-11-15 11:39:11 +01:00
Neil Orley
42d1072dee
NEW Tag the order as validated (opened) in the REST API
...
Tag the order as validated (opened)
2017-11-15 10:55:39 +01:00
Laurent Destailleur
c85acbfc11
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/fiche-rec.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/import/import_xlsx.modules.php
htdocs/install/repair.php
2017-11-14 19:47:33 +01:00
Laurent Destailleur
59d9ab731e
Add param $idwarehouse to settodraft
2017-11-14 01:29:28 +01:00
Laurent Destailleur
a12186a0b8
Use HTTP response code 304 instead of 500 when nothing is done
2017-11-14 01:26:02 +01:00
Laurent Destailleur
4212000caf
Update api_orders.class.php
2017-11-14 01:21:06 +01:00
Laurent Destailleur
bf05a0b8e0
Update api_orders.class.php
2017-11-14 01:19:04 +01:00
Neil Orley
d2a67e152b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api
2017-11-13 14:39:09 +01:00
Laurent Destailleur
b5196b7164
FIX A lot of several fix on local taxes and NPR tax
2017-11-13 14:24:40 +01:00
Laurent Destailleur
1a5bbef266
FIX Locatax were not propagated when cloning order or proposal
2017-11-13 13:07:31 +01:00
Laurent Destailleur
836f6bf3c9
Fix search filter when using extrafields 'links'
2017-11-12 12:39:23 +01:00
Laurent Destailleur
75e5d80eb6
Better help on mass invoicing from orders
2017-11-11 17:09:15 +01:00
Laurent Destailleur
d1860b87f8
NEW Add a confirmation for all mass action 'delete'
2017-11-11 16:34:11 +01:00
Neil Orley
c68f717071
NEW Update availability
...
Add the ability to update availability while updating an invoice using the REST API
2017-11-10 16:22:20 +01:00
Neil Orley
182fe4a90f
Change HTTP response code when nothing modified
2017-11-10 15:48:43 +01:00
Neil Orley
73fe991aed
NEW Return the order object when validate
...
Return the order object when the order is validated using the REST API
2017-11-10 15:46:53 +01:00
Laurent Destailleur
bc093ef969
FIX #7775 Order of deletion in delete method (trigger first)
2017-11-06 19:27:10 +01:00
Laurent Destailleur
ea5dd3eb3d
NEW Add REST API for supplier proposals
2017-11-06 11:06:31 +01:00
Laurent Destailleur
a329f7dc75
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
build/exe/doliwamp/doliwamp.iss
htdocs/accountancy/customer/list.php
htdocs/accountancy/supplier/list.php
2017-11-05 18:50:14 +01:00
Laurent Destailleur
d3a0cff30a
Merge pull request #7755 from frederic34/currency
...
default currency on propal create
2017-11-05 18:28:40 +01:00
Laurent Destailleur
bac6a434f4
Add link to make a direct download on card
2017-11-04 17:11:58 +01:00
Frédéric FRANCE
b58df17545
default currency on propal create
2017-11-02 18:14:55 +01:00
Laurent Destailleur
1b28c45e2c
PERF Links in getNomUrl use only one tag a instead of 2.
2017-11-02 15:19:14 +01:00
Laurent Destailleur
cfacfab6cf
NEW Show badge with nbr of shipment on shimpen tab of order
...
NEW Add button cancel on shipment creation
2017-11-02 12:38:36 +01:00
Laurent Destailleur
d569218162
Fix 'separate' extrafields must be visible by default.
...
Sandardize name of list pages (must end with _list.php)
2017-10-29 11:23:20 +01:00
Laurent Destailleur
9283aaf6aa
Fix scrutinizer
2017-10-27 00:07:58 +02:00
Laurent Destailleur
8058712d47
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/contrat/class/contrat.class.php
htdocs/product/list.php
2017-10-26 17:06:11 +02:00
Laurent Destailleur
67208b111d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/compta/facture.php
htdocs/expedition/card.php
htdocs/product/list.php
2017-10-26 17:02:40 +02:00
Laurent Destailleur
202712be94
Work on module builder
2017-10-25 22:02:07 +02:00
Laurent Destailleur
f24204c79a
Error management after extrafield update
2017-10-24 19:04:40 +02:00
Laurent Destailleur
c6e5115d34
Set default limit to 100 on all rest api that list
2017-10-22 15:42:19 +02:00
Laurent Destailleur
728e36f70f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/api/index.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/class/api_invoices.class.php
htdocs/core/actions_massactions.inc.php
htdocs/core/actions_sendmails.inc.php
2017-10-22 01:43:33 +02:00
Laurent Destailleur
f7556e7ad2
FIX make of link to other object during creation
2017-10-19 19:06:48 +02:00
TuxGasy
9c3805c0d5
Fix anchor after add line
2017-10-19 14:10:58 +02:00
Laurent Destailleur
93d16bf4d7
Fix several fixes in APIs
2017-10-19 12:30:36 +02:00
Laurent Destailleur
9c45e86a1c
Introduce main_doc into table of objects to know what is main doc.
...
Work on option PROPOSAL_USE_ONLINE_SIGN
2017-10-19 11:40:40 +02:00
Laurent Destailleur
7f85d73001
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/contrat/card.php
htdocs/expensereport/card.php
htdocs/fichinter/list.php
htdocs/fourn/commande/card.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/card.php
htdocs/fourn/paiement/card.php
htdocs/livraison/card.php
htdocs/modulebuilder/template/myobject_list.php
htdocs/societe/rib.php
htdocs/supplier_proposal/list.php
htdocs/user/card.php
2017-10-18 19:51:29 +02:00
Laurent Destailleur
8626d6279a
Fix perm to delete files
2017-10-18 17:21:30 +02:00
Laurent Destailleur
34e09315cc
Code comment
2017-10-18 15:35:51 +02:00
Laurent Destailleur
99239cbb38
Add API close to close an order
2017-10-18 15:34:03 +02:00
Laurent Destailleur
d40dda83cf
Add API "close" for proposals
...
Standardize code
2017-10-18 11:10:08 +02:00
Laurent Destailleur
8b140ab069
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-10-17 10:44:29 +02:00
Laurent Destailleur
eb1fdca157
NEW Can create intervention from a proposal
2017-10-17 10:44:18 +02:00
Laurent Destailleur
ebe0664aff
Merge branch 'develop' into scrutinizer-patch-3
2017-10-16 20:54:15 +02:00
Laurent Destailleur
45ac8367bd
NEW Add API for contracts
2017-10-16 17:56:59 +02:00
Scrutinizer Auto-Fixer
bd5bffa72c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-16 06:47:05 +00:00
Scrutinizer Auto-Fixer
165741517e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-13 11:28:26 +00:00
Laurent Destailleur
7c9993ef0e
Various fixes
2017-10-13 12:14:57 +02:00
Laurent Destailleur
8c5cf9ea45
Fix date output
2017-10-12 18:04:47 +02:00
Laurent Destailleur
051d49732d
Keep compatiblity of status key
2017-10-11 11:36:24 +02:00
Rui Strecht
666e62b440
Fixed issue with inexistent constant in commande STATUS_ACCEPTED
2017-10-09 17:54:15 +01:00
Laurent Destailleur
af1d2bfffd
Standardize code
2017-10-07 14:11:01 +02:00
Laurent Destailleur
74deb05527
Clean code. Use constant for status of supplier order process.
2017-10-07 13:04:31 +02:00
Laurent Destailleur
d28188d19d
FIX Generation of invoice from bulk action "Bill Orders"
...
Conflicts:
htdocs/fourn/class/fournisseur.facture.class.php
2017-10-04 14:31:52 +02:00
Laurent Destailleur
a74d6074a3
FIX Generation of invoice from bulk action "Bill Orders"
2017-10-04 14:27:10 +02:00
Laurent Destailleur
c22cd1cfe9
Fix test on entity must always be done using the "IN" instead of "="
2017-10-03 17:41:22 +02:00
Laurent Destailleur
f2e0ff0d30
Merge branch 'develop_dict' of https://github.com/hregis/dolibarr into hregis-develop_dict
2017-10-03 17:25:01 +02:00
Laurent Destailleur
2f20de2457
Fix cancel button on create
2017-10-03 14:57:38 +02:00
Regis Houssin
09e71f1390
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-10-02 11:51:27 +02:00
Laurent Destailleur
f007f9e7e5
NEW Add new property visible dy default on lists on extrafields
2017-09-29 13:26:44 +02:00
Regis Houssin
9823d6622c
Fix: use default $shared value
2017-09-27 17:40:02 +02:00
Regis Houssin
20684b4505
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/modules/rapport/pdf_paiement.class.php
htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
2017-09-27 17:22:18 +02:00
Laurent Destailleur
c9e9f60f8f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-09-25 19:55:52 +02:00
Laurent Destailleur
c5287e68b1
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/admin/multicurrency.php
htdocs/core/modules/modFournisseur.class.php
2017-09-25 19:54:27 +02:00
Regis Houssin
d592664150
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-09-25 06:48:26 +02:00
Laurent Destailleur
e3da4188e2
GETPOST must not clean data for text input.
2017-09-25 00:16:52 +02:00
Laurent Destailleur
f990667b1a
NEW Can send email from the member card using email templates.
2017-09-22 17:48:38 +02:00
TuxGasy
4043141ae3
Allow create shipping if STOCK_SUPPORTS_SERVICES option is enabled
2017-09-18 14:11:21 +02:00
Regis Houssin
a03ef95eaa
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/tables/llx_c_payment_term.sql
2017-09-18 09:11:04 +02:00
Laurent Destailleur
ab5724e7ff
Mutualize code for forms to send emails. Remove thousand line of code.
2017-09-17 17:12:14 +02:00
Laurent Destailleur
e014ac6ea9
NEW Send by email available in bulk for expense report
2017-09-16 22:03:25 +02:00
Laurent Destailleur
b4eab24490
Add project into list of customer orders
2017-09-16 20:32:28 +02:00
Laurent Destailleur
0fec777d0e
NEW On bulk email from a list, can uncheck "Join main document".
...
NEW Show direct preview link on contract
2017-09-16 18:31:30 +02:00
Laurent Destailleur
630dc92a13
NEW Mass PDF Merging is available on contracts
2017-09-16 15:39:52 +02:00
Regis Houssin
db17eb80ec
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/facture/class/paymentterm.class.php
2017-09-15 16:45:49 +02:00
Laurent Destailleur
5e34b121dd
Add more robust php unit to detect not escaped sql. Fix not escaped sql
2017-09-15 15:41:07 +02:00
Laurent Destailleur
e02c220c08
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-15 11:04:27 +02:00
Laurent Destailleur
cce1549f66
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/commande/card.php
htdocs/core/lib/functions.lib.php
htdocs/fourn/card.php
htdocs/public/members/new.php
2017-09-15 11:02:34 +02:00
Laurent Destailleur
0873260b8a
USe second parameter in GETPOST
2017-09-15 10:50:50 +02:00
Laurent Destailleur
2798726dba
Update card.php
2017-09-14 13:23:28 +02:00
Laurent Destailleur
51d1c35399
Merge pull request #7380 from tysauron/patch-8
...
$soc->getAvailableDiscounts . where soc not set.
2017-09-14 12:12:20 +02:00
Regis Houssin
a494e01f00
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-09-14 12:07:19 +02:00
Stéphane BERTHELOT
93defa5f59
Fix dates in commande and remisecheque for PostgreSQL (should be treated like strings)
2017-09-14 12:06:25 +02:00
Laurent Destailleur
165c3ac112
Merge pull request #7374 from EmisFR/develop
...
Fix dates in commande and remisecheque for PostgreSQL
2017-09-14 12:05:51 +02:00
TuxGasy
f0983353f2
Fix #7387 : filter clsed company when create new documents
2017-09-14 12:01:35 +02:00
Laurent Destailleur
149ab80b3a
The event array of an object is visible even if no event yet recorded.
2017-09-13 14:18:36 +02:00
Laurent Destailleur
71ce82b6b9
NEW Better autoselect customer or supplier fields to save clicks
2017-09-12 16:51:10 +02:00
tysauron
afac908fda
$soc->getAvailableDiscounts . where soc not set.
2017-09-12 12:35:06 +02:00
Stéphane BERTHELOT
66f671f4c8
Fix dates in commande and remisecheque for PostgreSQL (should be treated like strings)
2017-09-11 18:01:24 +02:00
Laurent Destailleur
b87ce172c3
FIX hidden option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN
2017-09-11 13:40:34 +02:00
Laurent Destailleur
59ab52c718
FIX hidden option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN
2017-09-11 13:39:03 +02:00
Regis Houssin
b5de8da3a6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/modules/modFacture.class.php
2017-09-11 08:07:55 +02:00
Laurent Destailleur
259cca0230
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/admin/mails_templates.php
2017-09-08 13:30:54 +02:00
Laurent Destailleur
03fe9d4e97
Escape all status
2017-09-08 13:23:12 +02:00
Laurent Destailleur
bde293af22
Fix filter on extrafield with type sellist
2017-09-07 15:34:25 +02:00
Regis Houssin
66e548427c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/resultat/clientfourn.php
htdocs/core/lib/functions.lib.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-09-07 10:50:35 +02:00
Laurent Destailleur
4b9f54e571
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/mysql/data/llx_accounting.sql
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
htdocs/install/mysql/tables/llx_holiday_config.sql
2017-09-01 17:34:57 +02:00
Regis Houssin
8e8f94df11
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/class/facture-rec.class.php
2017-08-30 19:33:23 +02:00
Laurent Destailleur
d3c95e030b
Fix delete file not possible for external user even with permissions
2017-08-30 14:34:36 +02:00
Laurent Destailleur
7aa09d8b71
NEW Can create thirdparty from card proposal, order or invoice
2017-08-28 18:37:16 +02:00
Regis Houssin
2f537a1ade
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/charges/index.php
htdocs/compta/paiement/list.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-08-22 18:49:40 +02:00
Laurent Destailleur
81b11100b0
Prepare code to clone site an fetch external page
2017-08-03 01:45:31 +02:00
Laurent Destailleur
5b1f5b0f20
Fix translation done twice into field title of array
2017-08-02 13:31:53 +02:00
Regis Houssin
0dc0fe81fc
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-31 07:40:01 +02:00
Laurent Destailleur
60493d0a47
Several fixes (permission, missing method or class) in REST APIs
2017-07-28 11:03:30 +02:00
Regis Houssin
acd5780e32
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-26 08:58:56 +02:00
Laurent Destailleur
cba898e2b9
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/compta/facture.php
2017-07-25 10:12:28 +02:00
Laurent Destailleur
aa9b4ce1f3
Fix too long combo for tags
2017-07-25 09:49:08 +02:00
Laurent Destailleur
25b107defb
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/contrat/list.php
htdocs/fichinter/list.php
2017-07-23 19:09:00 +02:00
Regis Houssin
26df1389f4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-07-21 20:42:21 +02:00
Laurent Destailleur
d07741ada1
Merge branch 'develop' into patch-rib
2017-07-21 14:58:33 +02:00
Regis Houssin
c8bd11660d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-07-18 15:23:43 +02:00
Laurent Destailleur
98cb1b7af1
Merge pull request #7171 from atm-ph/fix_5.0_search_lost
...
Fix lost search value in list if come from thirdparty card
2017-07-18 14:48:38 +02:00
Laurent Destailleur
b2c00ac463
Merge pull request #7161 from hguibourgdev/patch-4
...
Patch 4
2017-07-18 14:38:34 +02:00
phf
885fc3c5b7
Fix lost search value in list if come from thirdparty card
2017-07-17 11:04:48 +02:00
Regis Houssin
200f232164
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-16 07:51:20 +02:00
hguibourgdev
2166b3d467
Update card.php
...
FIX "!" is missing on test : empty($object->date_livraison)
2017-07-15 12:04:59 +02:00
Laurent Destailleur
743de4e586
FIX Option to classify proposal/order in workflow module must not set
...
source object to billed if amount differs.
2017-07-13 12:42:32 +02:00
Laurent Destailleur
0b4a1d9b65
Protection to avoid mass action execution when not required
2017-07-13 02:49:40 +02:00
Laurent Destailleur
9127892c71
Fix several minor bugs
2017-07-13 02:33:48 +02:00
Laurent Destailleur
2870798d07
Fix remove warnings
2017-07-13 00:35:10 +02:00
Regis Houssin
cb6b81d897
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-11 19:10:22 +02:00
Laurent Destailleur
8a9c38114f
Fix bug reported by scrutinizer
2017-07-08 19:05:51 +02:00
Laurent Destailleur
f40afcf023
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/accountancy/class/bookkeeping.class.php
htdocs/compta/facture/list.php
htdocs/compta/paiement/class/cpaiement.class.php
htdocs/compta/sociales/card.php
htdocs/core/lib/functions.lib.php
htdocs/expensereport/card.php
htdocs/expensereport/class/expensereport.class.php
htdocs/product/stats/facture.php
2017-07-08 18:32:34 +02:00
Laurent Destailleur
ba3b6b6aa5
Better support of vat with code in expense report
2017-07-08 18:09:45 +02:00
Laurent Destailleur
34d0c79e32
Merge pull request #7124 from fappels/develop_updateline_notriggerflag
...
New add trigger disable to updateline functions
2017-07-07 20:30:04 +02:00
Laurent Destailleur
47c6a324ac
Merge pull request #7086 from OPEN-DSI/core_commande_warning_delay_dashboard
...
FIX: Function load_board in commande.class.php for warnings delay in dashboard
2017-07-07 18:56:31 +02:00
Laurent Destailleur
252d8da8fc
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/filefunc.inc.php
htdocs/societe/class/societe.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2017-07-07 15:11:53 +02:00
fappels
6effcb0829
New add trigger disable to updateline functions
2017-07-06 16:26:15 +02:00
Regis Houssin
3f882cb33a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-07-03 09:24:05 +02:00
Laurent Destailleur
7ae52d843c
Look and feel v6
2017-07-01 14:23:24 +02:00
Laurent Destailleur
d55213286e
Fix missing parameter
2017-06-30 11:40:26 +02:00
KHELIFA
7dc4eeddf0
FIX: Function load_board in commande.class.php for warnings delay in dashboard
2017-06-29 16:44:52 +02:00
Regis Houssin
fa247ffd98
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-29 08:51:42 +02:00
Laurent Destailleur
6f82837b0f
Fix GETPOST of lang_id
2017-06-27 17:27:01 +02:00
Laurent Destailleur
4102403482
Look and feel v6
2017-06-21 11:37:34 +02:00
Regis Houssin
2fffd2fa6f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-20 23:26:21 +02:00
Laurent Destailleur
08a86fa03d
Start #6981
2017-06-20 12:17:13 +02:00
Regis Houssin
909826e24f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-20 06:25:35 +02:00
Laurent Destailleur
bb2d27280b
Fix sort link must be disabled for computed field
2017-06-19 14:31:08 +02:00
Regis Houssin
a0299042e4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-17 12:05:33 +02:00
Laurent Destailleur
5b7a8e9c90
Fix missing signature when sending email from user card
2017-06-17 10:17:36 +02:00
Regis Houssin
cd095e99c9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-14 12:16:10 +02:00
Laurent Destailleur
1b56e4a01c
Fix look and feel v6
2017-06-14 11:28:42 +02:00
Regis Houssin
d1233755f6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-11 11:41:02 +02:00
Laurent Destailleur
a96362e2f9
Fix #formmailbeforetitle not supported everywhere
2017-06-11 11:40:01 +02:00
Regis Houssin
cc75916599
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-11 11:26:24 +02:00
Laurent Destailleur
e93cefbbf0
FIX #6985
2017-06-11 10:37:58 +02:00
Regis Houssin
3445c9d329
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/lib/functions.lib.php
2017-06-11 06:27:49 +02:00
Laurent Destailleur
7c0de18ac1
Fix code comment
2017-06-10 12:56:28 +02:00
Laurent Destailleur
3347316d3c
Fix delete of member
2017-06-09 17:02:05 +02:00
Regis Houssin
58b3d86b49
Fix: errors
2017-06-09 09:40:43 +02:00
Regis Houssin
fa58f0f3e8
Fix: add entity filter
2017-06-09 09:25:15 +02:00
Laurent Destailleur
b441c62e1d
Fix syntax error
2017-06-08 14:55:12 +02:00
Laurent Destailleur
b1f93ccb0c
Fix security
2017-06-08 14:33:46 +02:00
Regis Houssin
2b36135641
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
2017-06-07 20:14:03 +02:00
Laurent Destailleur
1820649175
Maxi debug of v6
2017-06-07 19:28:31 +02:00
Regis Houssin
bfd6116e5b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
2017-06-06 15:03:36 +02:00
Laurent Destailleur
02b5d9e6f7
FIX #6945
2017-06-06 10:53:53 +02:00
Regis Houssin
5c5663c5ae
New: getEntity function use true $shared value by default
2017-05-30 18:50:54 +02:00
Laurent Destailleur
f5e29d6c86
Fix phpcs warning
2017-05-22 10:45:02 +02:00
Laurent Destailleur
b3dc73e611
Look and feel v6
2017-05-21 02:43:51 +02:00
Laurent Destailleur
2021758403
Merge pull request #6834 from atm-ph/fix_fk_project_on_create_order_from_propal
...
Fix fk project on create order from propal
2017-05-20 12:13:42 +02:00
Laurent Destailleur
470165615f
Fix look and feel v6
2017-05-19 16:32:23 +02:00
Laurent Destailleur
aec4cef5de
Clean some code for type of event deprecated since 3.3
2017-05-19 12:58:38 +02:00
Laurent Destailleur
7dbe3b1da9
Merge pull request #6843 from aspangaro/6.0-multijournal
...
Fix : Sql error on salaries index for accountancy multijournal + debug
2017-05-18 17:45:21 +02:00
Laurent Destailleur
ff5d682d49
Fix css
2017-05-18 03:12:29 +02:00
Laurent Destailleur
b0f0285137
Standardize code
2017-05-16 21:29:18 +02:00
Laurent Destailleur
68e333879f
Fix var not sanitized
2017-05-16 13:27:32 +02:00
phf
4d9016c49f
Fix create propal form from propal with project id, fk_project is not used to init select project
2017-05-15 10:12:58 +02:00
Alexandre SPANGARO
93554b7e30
Typo searchpicto
2017-05-14 21:06:33 +02:00
Laurent Destailleur
b568877f22
Merge pull request #6829 from grandoc/new_branch_10_05
...
Update code using new css class
2017-05-13 19:47:27 +02:00
Laurent Destailleur
553f5b990c
Fix scrutinizer errors
2017-05-13 18:50:55 +02:00
Laurent Destailleur
0d11fce834
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-12 15:45:30 +02:00
Laurent Destailleur
b81de35703
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/sociales/class/chargesociales.class.php
htdocs/contrat/class/contrat.class.php
2017-05-12 15:44:09 +02:00
Laurent Destailleur
419c15ee8e
Fix escaping class
2017-05-12 15:28:10 +02:00
Laurent Destailleur
30cf3f2bda
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/install/mysql/tables/llx_bank_account.sql
2017-05-11 00:03:06 +02:00
Laurent Destailleur
922fa088b4
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/boxes/box_services_expired.php
2017-05-10 23:47:33 +02:00
Laurent Destailleur
b2e9d4cc21
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-05-10 23:42:49 +02:00
philippe grand
b7b16dc632
Update code using new css class
2017-05-10 16:41:19 +02:00
Laurent Destailleur
5e54567558
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/skeletons/skeleton_list.php
2017-05-10 13:30:35 +02:00
Laurent Destailleur
3e0fcf5ec2
Fix label "total for this page" on last page.
2017-05-10 11:57:59 +02:00
Laurent Destailleur
e5c898e0d6
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
build/makepack-dolibarr.pl
htdocs/fichinter/list.php
htdocs/product/list.php
htdocs/projet/tasks/list.php
2017-05-10 00:48:27 +02:00
Laurent Destailleur
6d01bd712d
FIX Better sanitizing of search all parameter.
2017-05-09 19:36:10 +02:00
Ferran Marcet
dbcb60433b
FIX: Correction with author and validator user on orders
2017-05-09 13:31:20 +02:00
Laurent Destailleur
11b1a2adac
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/expensereportsjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/bank/index.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/includes/odtphp/Segment.php
htdocs/langs/en_US/admin.lang
htdocs/societe/soc.php
2017-05-05 14:49:25 +02:00
Laurent Dinclaux
24a2fb57ea
Resolved merge conflict
2017-05-05 10:22:46 +11:00
Laurent Dinclaux
909b489d1f
More fixes regarding localtaxes not being diplayed in generated PDF and vat_src_code not being propagating properly when generating posts from type to type.
2017-05-04 10:05:55 +11:00
Laurent Dinclaux
421843e693
Fix missing localtaxes lines in "commande" PDF
2017-05-03 23:35:57 +11:00
Laurent Dinclaux
f63f28c7fe
Fix vat_src_code propagation between post types
2017-05-03 21:37:30 +11:00
Laurent Destailleur
3917bdfc79
Fix vat_src_code propagation.
2017-05-02 22:37:43 +02:00
Laurent Destailleur
865c8140d1
Clean code
2017-04-30 03:23:06 +02:00
Laurent Destailleur
cfde27820e
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/translation.php
htdocs/comm/card.php
htdocs/core/menus/standard/eldy.lib.php
2017-04-27 17:20:40 +02:00
Philippe Grand
c18e7e8816
Merge branch 'develop' into testing
2017-04-19 11:27:36 +02:00
Maxime Kohlhaas
402924f6d7
Fix : no origin on stock mvmt when order set back to draft
2017-04-14 15:12:32 +02:00
Laurent Destailleur
846204bdb4
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 13:02:29 +02:00
Laurent Destailleur
39ebaec064
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 11:22:48 +02:00
Laurent Destailleur
3e9ccc186a
NEW Small PDF template for products
2017-04-13 10:26:12 +02:00
Laurent Destailleur
26a9999fbf
Support of preview for pdf with several pages
2017-04-12 11:38:55 +02:00
philippe grand
c3387cb4e6
ref column was missing for specimen and some update
2017-04-11 14:54:34 +02:00
Laurent Destailleur
b054ca8267
NEW Introduce mass action on product list ('delete' for the moment)
2017-04-09 15:02:55 +02:00
Laurent Destailleur
0a47245ba5
NEW Add mass actions (pdf merge and delete) for interventions
2017-04-09 14:31:56 +02:00
Laurent Destailleur
52c86cb3f5
NEW Bulk actions available on supplier orders
2017-04-09 13:12:25 +02:00
Laurent Destailleur
be439f6252
Work on look and feel v6
2017-04-07 16:16:44 +02:00
Laurent Destailleur
60a54041c2
NEW Enable bulk actions delete on supplier invoices
2017-04-07 14:09:19 +02:00
Laurent Destailleur
d99b0461c7
Extrafields multilanguage support.
2017-04-03 10:56:28 +02:00
Laurent Destailleur
93687997c9
Work on 6.0 look and feel
2017-03-31 18:40:53 +02:00
Laurent Destailleur
54b03a3552
Work on 6.0 new look and feel
2017-03-29 11:03:13 +02:00
Laurent Destailleur
41063e7cf2
Fix: trigger for delete must be before delete of element
2017-03-28 12:55:20 +02:00
Laurent Destailleur
3740137e31
Add tooltip on label of each open item.
2017-03-28 10:44:52 +02:00
Laurent Destailleur
f843f8a93d
Start to move search bar before table titles
2017-03-27 00:48:50 +02:00
BENKE Charlie
afefb47598
Update list.php
2017-03-26 01:50:00 +01:00
BENKE Charlie
3aff053828
Update list.php
2017-03-24 23:40:34 +01:00
Laurent Destailleur
38660418b4
Include preview of pdf into dol_banner
2017-03-23 22:27:44 +01:00
Laurent Destailleur
3adb43c6e5
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/boxes/box_produits.php
htdocs/core/boxes/box_produits_alerte_stock.php
htdocs/langs/en_US/bills.lang
htdocs/product/class/product.class.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2017-03-23 12:52:19 +01:00
Laurent Destailleur
7df9c25e60
Several fixes on multicurrency
2017-03-23 12:44:20 +01:00
Laurent Destailleur
b9a9997688
Page societe/soc.php and compta/facture.php was renamed into card.php
...
to match page naming conventions.
2017-03-20 21:29:22 +01:00
Laurent Destailleur
4831fb4dcb
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/filefunc.inc.php
2017-03-19 11:26:49 +01:00
Juanjo Menent
5c028b30d5
Fix #6512 Bug: Invalid argument in when submitting orderstoinvoice.php-form
2017-03-17 17:05:59 +01:00
Laurent Destailleur
68e50d0c79
FIX Filter on date lost after submit on time spent page
2017-03-16 10:36:17 +01:00
Laurent Destailleur
184d52525a
PHP code to manage pair/impair is replaced by native CSS.
2017-03-07 22:45:22 +01:00
Laurent Destailleur
5f79b2d0c6
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/accountancy/admin/categories.php
htdocs/expensereport/class/expensereport.class.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2017-03-05 22:11:35 +01:00
Laurent Destailleur
6e2aaf7408
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/commande/list.php
2017-03-05 22:03:38 +01:00
Laurent Destailleur
ee25a412dd
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/commande/list.php
2017-03-05 22:02:16 +01:00
Laurent Destailleur
f67c967d0b
FIX The vat rate line used when adding a predefined product was wrong if
...
there is several vat line with same rate.
2017-03-04 22:27:44 +01:00
Laurent Destailleur
07c828d38f
Introduce method loadLangs to save code lines
2017-03-03 13:27:51 +01:00
gauthier
9cd807af1a
FIX : param billed when we change page
2017-02-28 12:31:45 +01:00
Laurent Destailleur
19e60f03b9
Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms
2017-02-21 14:17:44 +01:00
Laurent Destailleur
c3d78bf1b4
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/update.php
2017-02-16 22:09:37 +01:00
Laurent Destailleur
1a3b9fada5
Som fixes on generator of samples
2017-02-16 01:50:02 +01:00
Laurent Destailleur
e1a6e6e4ab
Rename "attributes" into "variants" to avoid confusion with extrafields
2017-02-08 12:37:38 +01:00
Laurent Destailleur
b24f244f67
Merge pull request #5533 from marcosgdf/prod-attr
...
Feature Request: NEW Added product attributes feature
2017-02-08 11:20:33 +01:00
Marcos García de La Fuente
2dfced366e
NEW #2763 Go to document block after clicking in Generate document button
...
Close #2763
2017-02-03 20:11:06 +01:00
Marcos García de La Fuente
d06fb423c0
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/langs/en_US/products.lang
2017-02-02 20:07:41 +01:00
Laurent Destailleur
13f37b2cb9
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-02 02:25:49 +01:00
Laurent Destailleur
f6144b9ecb
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-02-02 02:24:57 +01:00
Maxime Kohlhaas
7b6488b1c7
Fix numbering was disaplying technical error instead of error message
2017-01-27 10:05:57 +01:00
Laurent Destailleur
c48400331f
Merge pull request #6157 from atm-ph/new_develop_use_rate_on_document_date
...
NEW get multicurrency rate from document date (propal, order)
2017-01-27 01:32:52 +01:00
Laurent Destailleur
5fd8b1efcb
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-22 21:23:35 +01:00
Laurent Destailleur
f875597c0b
Fix statistics of leave requests (date valid not defined if status is
...
draft)
2017-01-22 16:03:08 +01:00
Laurent Destailleur
39151d7a74
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-22 12:14:18 +01:00
Laurent Destailleur
65f7de8f64
Fix css and look 5.0
2017-01-22 12:13:32 +01:00
Laurent Destailleur
412be59f78
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-01-20 12:09:39 +01:00
Laurent Destailleur
d48f2507b5
Fix link attachment on bank document page
2017-01-18 15:37:45 +01:00
Marcos García de La Fuente
e0cbcadd98
In case Model for document generation is not defined, the criteria to select the model is now:
...
1. Model for the object
2. Custom default module
3. Hardcoded default module
2017-01-16 21:16:05 +01:00
Laurent Destailleur
4ecd657f34
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-16 00:02:43 +01:00
Laurent Destailleur
d14e4dbaba
Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on
2017-01-15 20:49:20 +01:00
Marcos García de La Fuente
d09a3628c5
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/compta/facture.php
2017-01-14 23:59:14 +01:00
Laurent Destailleur
2c6672d17a
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/tpl/login.tpl.php
2017-01-12 11:32:51 +01:00
Laurent Destailleur
c42b48636a
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/commande/class/api_commande.class.php
htdocs/core/class/CMailFile.class.php
htdocs/societe/class/api_contact.class.php
2017-01-12 11:06:24 +01:00
KiteAtao
5c76229cdf
Fix Commands Api for REST WebServices
2017-01-07 21:46:49 +01:00
Laurent Destailleur
e9853f3cd7
Merge branch 'develop' of https://github.com/Franck-MOREAU/dolibarr into
...
Franck-MOREAU-develop
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
htdocs/loan/card.php
htdocs/loan/class/loan.class.php
htdocs/projet/element.php
2017-01-07 17:45:05 +01:00
Laurent Destailleur
fd09a3d35e
Fix link to notes and download pdf not visible on list of expense report
2017-01-02 13:51:05 +01:00
Laurent Destailleur
b642a3a602
Prepare release 5.0
2016-12-31 16:35:56 +01:00
Marcos García de La Fuente
5669f734b8
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/comm/propal/card.php
# htdocs/commande/card.php
# htdocs/compta/facture.php
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-12-24 21:39:40 +01:00
Laurent Destailleur
b777ec79f2
Fix contextpage implementation into skeleton
2016-12-23 10:38:27 +01:00
Laurent Destailleur
9e44eb0d15
Fix return code REST similar for all api with POST
2016-12-23 02:08:22 +01:00
Laurent Destailleur
2fd3aa54f5
Merge pull request #6173 from defrance/patch-62
...
Cleaning code
2016-12-18 11:17:22 +01:00
Laurent Destailleur
12e919b99d
Merge pull request #6182 from atm-ph/fix_develop_user_right_write_margin
...
Fix user right write margin
2016-12-18 10:53:34 +01:00
Laurent Destailleur
60b8582aa9
Fix more then 30 security defects
2016-12-18 01:44:26 +01:00
phf
cca7967144
Merge branch 'fix_user_right_write_margin' into fix_develop_user_right_write_margin
2016-12-15 16:19:54 +01:00
BENKE Charlie
8b4aa701d7
Update note.php
2016-12-15 15:04:59 +01:00
BENKE Charlie
6766c33110
Update info.php
2016-12-15 15:02:45 +01:00
phf
21a648a052
Fix user right on margin module to write buyprice
2016-12-15 12:01:46 +01:00
phf
f5bffeb535
New get multicurrency rate from document date (propal, order)
2016-12-11 16:30:01 +01:00
Juanjo Menent
1c71eed703
Very best fix of cancel edit line
2016-12-11 15:37:29 +01:00
Juanjo Menent
7915021495
Best fix of cancel edit line
2016-12-11 15:23:07 +01:00
Juanjo Menent
c62a2fb97e
Best fix of cancel edit line
2016-12-11 15:21:06 +01:00
Juanjo Menent
5233c65aba
Merge pull request #6152 from jpfox/develop
...
FIX cancelling order line modification returned to list instead of card
2016-12-11 15:00:37 +01:00
Jean-Pierre Morfin
4a39c79d56
FIX cancelling order line modification returned to list instead of card
2016-12-11 14:32:27 +01:00
Maxime Kohlhaas
df019b255f
Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko_multicurrency_debug
...
# Conflicts:
# htdocs/commande/class/commande.class.php
2016-12-11 13:48:24 +01:00
Laurent Destailleur
74c463fd21
Fix phpcs
2016-12-11 13:31:15 +01:00
Laurent Destailleur
2dcb97e61d
Continue work on dol_banner
2016-12-11 13:16:21 +01:00
Maxime Kohlhaas
0302e8c1f8
Missing comment
2016-12-11 09:29:20 +01:00
Maxime Kohlhaas
177ec97689
Actualize currency on propal, order and invoice
2016-12-11 01:04:58 +01:00
Maxime Kohlhaas
d426ab04f0
Multicurrency on proposal and order
2016-12-11 00:42:52 +01:00
Laurent Destailleur
d5e417010f
Complete work on dol_banner
2016-12-09 11:16:04 +01:00
Laurent Destailleur
1838670e31
Fix several security holes on api when used by external users
2016-12-07 19:02:39 +01:00
Laurent Destailleur
2a8f23e8c5
Fix labels
2016-12-06 15:03:39 +01:00
Laurent Destailleur
db9af0118c
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modAdherent.class.php
2016-12-06 14:08:43 +01:00
Laurent Destailleur
761a795294
Maxi debug on REST APIs
2016-12-05 13:31:29 +01:00
Laurent Destailleur
2b8fbf200a
Complete work on the new dol_banner
2016-12-03 21:29:49 +01:00
Laurent Destailleur
6e5a8b6787
FIX Some statistics not compatible with multicompany module.
2016-12-03 19:14:16 +01:00
Laurent Destailleur
bd8f923cee
Several fixes in filter on lists
2016-11-29 22:52:16 +01:00
Laurent Destailleur
e59edca855
Fix Responsive design
2016-11-27 20:55:59 +01:00
Marcos García de La Fuente
cf0ee36150
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-11-27 18:10:01 +01:00
Laurent Destailleur
017b18d5c6
Fix #6037 #6041
2016-11-27 16:09:16 +01:00
Laurent Destailleur
e4a8342aef
Fix div-table-form balance on all lists (solve responsive design)
2016-11-27 11:41:10 +01:00
Laurent Destailleur
5acd09b2d5
Fix require_once instead of require.
2016-11-24 17:03:18 +01:00
Laurent Destailleur
c1628be9c0
Code comment to add some explanations
2016-11-23 12:29:42 +01:00
Laurent Destailleur
dd27a52a85
Fix several problems on new REST API on project/tasks
2016-11-19 16:08:27 +01:00
Laurent Destailleur
62e0d4ec3f
FIX Several problems into shipment management with lot enabled
2016-11-14 14:34:15 +01:00
Laurent Destailleur
ecbe719f23
FIX Several problems into shipment management with lot enabled
2016-11-14 13:40:41 +01:00
Laurent Destailleur
35d80aa209
Miscellaneous fixes
2016-11-12 12:40:06 +01:00
Laurent Destailleur
9fd5ddf807
NEW Add REST API for projects
2016-11-09 22:54:51 +01:00
Laurent Destailleur
d1446bb7ef
NEW Show subtotal into list of linked elements
2016-11-08 19:19:30 +01:00
Laurent Destailleur
fcca3d6be1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-11-08 17:21:41 +01:00
Laurent Destailleur
6d70d39bbd
NEW Add type "url" as possible extrafield.
2016-11-08 17:21:26 +01:00
Marcos García de La Fuente
286095f5cd
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/fourn/facture/card.php
# htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-11-06 15:01:40 +01:00
BENKE Charlie
06c6a1107d
same error
2016-11-05 11:00:40 +01:00
Laurent Destailleur
59291be6e0
NEW Can filter on status on objects on the "statistics" page.
2016-11-03 19:50:04 +01:00
Laurent Destailleur
ef03f59e50
Uniformize code
2016-11-02 12:16:46 +01:00
Laurent Destailleur
019125f258
Uniformize code
2016-11-02 10:29:14 +01:00
Laurent Destailleur
e9edbba093
NEW Usage of vat code seems ok everywhere.
2016-10-29 21:02:08 +02:00
Laurent Destailleur
91ee1fae51
Fix feature to jump on a numbered page.
2016-10-29 17:46:11 +02:00
Laurent Destailleur
32b6660f63
Uniformize code
2016-10-29 16:18:39 +02:00
Laurent Destailleur
220d81b350
Fix duplicate tooltips
2016-10-28 17:43:29 +02:00
Laurent Destailleur
6938b05219
Mutualize code to show files generated for mass actions
2016-10-28 12:00:30 +02:00
Laurent Destailleur
54bd355800
Better help
2016-10-27 02:02:40 +02:00
Laurent Destailleur
f67863e1aa
NEW Can use any filter on all REST API to list.
2016-10-25 19:15:47 +02:00
Laurent Destailleur
6ef74b33c9
Uniformize code
2016-10-25 11:09:26 +02:00
Laurent Destailleur
6338b04ac0
Remove call of a deprecated function
2016-10-24 11:27:39 +02:00
Laurent Destailleur
33a7b7037d
Save information of vat code into database
2016-10-24 03:23:40 +02:00
Laurent Destailleur
0b63f89e3a
Merge branch 'NEW_customerorders_to_bill' of
...
https://github.com/atm-gauthier/dolibarr into
atm-gauthier-NEW_customerorders_to_bill
Conflicts:
htdocs/langs/en_US/bills.lang
2016-10-24 00:44:37 +02:00
Laurent Destailleur
24ee2bce14
FIX Can edit the customer ref even if order is not draft.
2016-10-18 12:57:30 +02:00
Laurent Destailleur
dfbca2d0ad
Merge pull request #5868 from olsesacl/#5830
...
NEW: #5830 Allow Generic E-mail Sender
2016-10-15 02:43:19 +02:00
Laurent Destailleur
d27dea8320
NEW Can rename uploaded or generated files on all "documents" tabs.
2016-10-14 18:09:24 +02:00
Sergio Sanchis Climent
8556dab68e
NEW: #5830
2016-10-13 16:44:17 +02:00
gauthier
5803087d4f
NEW : concat of all invoice pdf if invoice validation
2016-10-07 14:32:27 +02:00
gauthier
23255976ef
FIX : require class discount
2016-10-07 11:21:58 +02:00
gauthier
fbd06e48cd
NEW : classify billed orders and trads
2016-10-07 09:20:34 +02:00
gauthier
cdc62f4054
NEW : bill orders from order list
2016-10-06 17:38:00 +02:00
Laurent Destailleur
e79a84a89b
Uniformize code
2016-10-05 21:49:04 +02:00
Laurent Destailleur
6ac39b97e4
Fix restore list of attached files into action report
2016-10-03 00:38:28 +02:00
Laurent Destailleur
45a808e034
NEW Generation of document is available on member card
2016-10-03 00:08:47 +02:00
Laurent Destailleur
ee252f549a
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
dev/skeletons/skeleton_list.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/core/lib/cron.lib.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
2016-10-01 18:42:50 +02:00
Laurent Destailleur
03c60f1b7d
FIX #5802 Incoterms not set
2016-10-01 13:55:07 +02:00
Laurent Destailleur
2b8255590a
Better error message
2016-09-29 13:55:46 +02:00
florian HENRY
4e5f646a0f
fix travis test
2016-09-26 17:07:45 +02:00
florian HENRY
5a8f0491b3
wotk on declaration method OrderLine
2016-09-26 09:34:51 +02:00
Laurent Destailleur
3cb13e16d1
Merge branch 'rest-api-add-accounts' of
...
https://github.com/EuskalMoneta/dolibarr into
EuskalMoneta-rest-api-add-accounts
Conflicts:
htdocs/api/index.php
htdocs/commande/class/api_orders.class.php
2016-09-26 02:28:16 +02:00
Laurent Destailleur
d39d7d92c9
Uniformize code.
2016-09-26 02:13:58 +02:00
Laurent Destailleur
100312aac2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/adherents/class/cotisation.class.php
2016-09-26 01:32:50 +02:00
Laurent Destailleur
ea09eb13da
Uniformize code
2016-09-26 00:10:29 +02:00
Laurent Destailleur
34378d8bef
Fix phpcs
2016-09-25 17:48:48 +02:00
Laurent Destailleur
a7db09c020
Fix phpcs
2016-09-24 23:06:09 +02:00
aspangaro
922495d72d
Correct travis & typo "Execuete"
2016-09-24 07:18:38 +02:00
Laurent Destailleur
35dd492d19
NEW Add REST api for commercial proposals
2016-09-22 12:53:44 +02:00
Laurent Destailleur
4f842fd2cb
Uniformize look and feel
2016-09-19 13:57:50 +02:00
Laurent Destailleur
af28a67803
Uniformize look using dol_banner
2016-09-19 10:43:30 +02:00
Laurent Destailleur
2facdda690
Uniformize code
2016-09-12 21:54:45 +02:00
Laurent Destailleur
0ab377440d
Complete param of setValueFrom
2016-09-12 20:16:39 +02:00
Laurent Destailleur
9ff1809f85
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contrat/list.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/card.php
htdocs/product/stock/class/productlot.class.php
htdocs/theme/eldy/style.css.php
2016-09-12 02:05:38 +02:00
Laurent Destailleur
1fbf233f95
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/contact/list.php
htdocs/contrat/list.php
htdocs/expedition/list.php
htdocs/expensereport/list.php
htdocs/fichinter/list.php
htdocs/fourn/commande/list.php
htdocs/product/reassort.php
htdocs/product/reassortlot.php
htdocs/product/stock/list.php
htdocs/societe/list.php
htdocs/supplier_proposal/list.php
htdocs/theme/eldy/style.css.php
2016-09-12 01:50:38 +02:00
Laurent Destailleur
49e54d55d5
Removed old option PRODUCT_SHOW_WHEN_CREATE. It was bugged and not
...
usable.
2016-09-10 18:19:54 +02:00
Laurent Destailleur
1b00d55021
NEW New set of icon for status easier to understand.
2016-09-10 17:57:35 +02:00
Laurent Destailleur
aeffffe523
NEW REST api order: Parameter to filter thirdparty can be a list of ids
2016-09-09 20:09:12 +02:00
Laurent Destailleur
616594355b
NEW Can select fields on expense report list. Can make mass delete.
2016-09-09 15:36:33 +02:00
Ferran Marcet
b5db70342b
Fix: Search all is lost on lists when pagination or when the columns are sorted
2016-09-09 13:58:41 +02:00
Marcos García de La Fuente
05728075d6
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/install/mysql/migration/3.9.0-4.0.0.sql
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-09-06 21:06:33 +02:00
Laurent Destailleur
10c1f02243
Extrafields for expensereports are visible on cards
2016-09-06 13:39:44 +02:00
Laurent Destailleur
b52e2f404c
NEW Can select fields/extrafields on contract list + Mass delete action.
2016-09-02 14:47:59 +02:00
Laurent Destailleur
91ede48390
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-01 11:37:40 +02:00
Laurent Destailleur
ec5bd2a8f8
Fix button create contract from order not visible sometimes
2016-09-01 00:40:48 +02:00
Laurent Destailleur
fac28f9589
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/sociales/charges.php
htdocs/core/boxes/modules_boxes.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
2016-08-28 02:40:20 +02:00
Josep Lluís
c385b86793
Bug: delivery date value is not hide with global ORDER_DISABLE_DELIVERY_DATE
...
In title and in filter the delivery date column is well hidden.
The error is only in column value,
2016-08-16 23:12:02 +02:00
florian HENRY
5bb3b5c074
FIX : MULTICURRENCY if value is 1,56 then GETPOST 'int' check return ''
2016-08-10 09:47:25 +02:00
Laurent Destailleur
4d4fc87e2b
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/product/stock/productlot_list.php
htdocs/websites/index.php
2016-08-09 13:26:08 +02:00
Laurent Destailleur
bcd055b378
Move button to link to, in same part of code than code to output links.
2016-08-05 15:30:28 +02:00
Laurent Destailleur
890e6f59c8
NEW Support mass actions for proposals
2016-08-05 13:08:23 +02:00
Laurent Destailleur
782ab6a02b
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/core/modules/barcode/modules_barcode.class.php
htdocs/product/admin/product.php
2016-08-05 00:42:40 +02:00
Laurent Destailleur
7a7e7b330f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-08-04 11:58:11 +02:00
Laurent Destailleur
7f6e2a277a
NEW Link between objects can be done on both side and on all objects
2016-08-04 11:57:37 +02:00
Laurent Destailleur
f0c75388cb
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/api_commande.class.php
htdocs/compta/facture/class/api_invoice.class.php
htdocs/product/class/api_product.class.php
htdocs/societe/class/api_contact.class.php
htdocs/societe/class/api_thirdparty.class.php
2016-08-02 17:43:12 +02:00
Laurent Destailleur
dfc38351ef
Fix $i not initialized
2016-08-01 19:48:39 +02:00
Laurent Destailleur
5eda10e0dd
Fix link
2016-08-01 16:04:49 +02:00
Laurent Destailleur
b267402df6
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/main.lang
htdocs/societe/rib.php
2016-08-01 15:15:32 +02:00
Laurent Destailleur
5d81db9693
Update skeleton with mass action code
2016-07-30 20:05:54 +02:00
Laurent Destailleur
857de64607
Fix multicurrency
2016-07-30 16:41:10 +02:00
Marcos García de La Fuente
86c2ced714
Missing $user variable
2016-07-29 11:53:24 +02:00
Laurent Destailleur
4e8e7f8e05
NEW New REST API explorer. Can create invoice and orders with lines.
2016-07-29 02:28:51 +02:00
Laurent Destailleur
9ca7f2cb66
Better support for option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN (on by
...
default).
2016-07-28 19:02:23 +02:00
Laurent Destailleur
e4f51b7f32
FIX Select new thirdparty
2016-07-27 14:15:58 +02:00
Laurent Destailleur
a147798f18
FIX Select new thirdparty
2016-07-27 14:15:14 +02:00
Laurent Destailleur
ee0c77a305
Merge branch 'refactor-rest-api' of
...
https://github.com/EuskalMoneta/dolibarr into
EuskalMoneta-refactor-rest-api
Conflicts:
htdocs/api/admin/explorer.php
2016-07-27 14:06:14 +02:00
Marcos García de La Fuente
1ef27913d7
FIX #5549 getNomUrl tooltips show Order info even if user has no rights to read them
2016-07-26 17:07:56 +02:00
Laurent Destailleur
f0a3a5ce02
NEW Mutualize mass action. So "Send by email" is also avavilable on
...
orders.
2016-07-25 21:50:41 +02:00
Laurent Destailleur
a82e551a54
Start to work to mutualize code of mass actions
2016-07-25 19:43:07 +02:00
Marcos García de La Fuente
b1c552ee9d
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/install/mysql/tables/llx_product_attribute.key.sql
# htdocs/install/mysql/tables/llx_product_attribute_combination2val.sql
2016-07-24 11:54:38 +02:00
Marcos García de La Fuente
c082505021
NEW Added product attributes feature
2016-07-24 11:27:52 +02:00
Laurent Destailleur
08d23b482b
NEW Introduce mass action "delete" on sales orders.
2016-07-23 12:17:47 +02:00
Laurent Destailleur
42be661b1d
Fix bad error message output
2016-07-21 17:36:59 +02:00
Laurent Destailleur
5749c1889d
Fix bad error message output
2016-07-21 17:35:23 +02:00
Laurent Destailleur
5203ddc253
FIX Missing $user
2016-07-21 17:22:24 +02:00
florian HENRY
10b0e5dd57
clean trigger and normalize code
2016-07-08 21:28:21 +02:00
florian HENRY
2d9876d127
clean command class
2016-07-08 21:02:27 +02:00
florian HENRY
195d6187a3
NEW : Uniformize code and correct deal with triggers
2016-07-08 20:40:25 +02:00
florian HENRY
80d3c68c07
NEW : Add ORDER_MODIFY trigger on each order modification
2016-07-08 18:30:50 +02:00
Laurent Destailleur
061ccadd03
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/commande/list.php
htdocs/fourn/commande/orderstoinvoice.php
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions
htdocs/install/pgsql/functions/functions.sql
2016-07-06 15:11:29 +02:00
Laurent Destailleur
a8f06d78b1
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/install/pgsql/functions/functions.sql
2016-07-06 14:53:05 +02:00
Laurent Destailleur
da5228aaa9
Selection of fields ok for interventions
2016-07-06 10:28:34 +02:00
fmarcet
50c5efc374
Fix: Don't load extrafields on orderstoinvoice
2016-07-05 16:41:46 +02:00
Laurent Destailleur
59f86a12d2
Fix delete of documents generated on project.
...
Fix missin translation
2016-07-01 17:49:13 +02:00
Laurent Destailleur
9b1caefbf9
Fix bad var
2016-06-28 02:40:42 +02:00
Laurent Destailleur
b529a53501
Fix var not initialized
2016-06-28 02:36:40 +02:00
Laurent Destailleur
1368e6d462
Fix: error message was not enough to understand
...
Conflicts:
htdocs/langs/en_US/errors.lang
2016-06-24 21:32:38 +02:00
Laurent Destailleur
f97b67db6b
Fix: error message was not enough to understand
2016-06-24 17:04:59 +02:00
Xebax
e12e1980fc
REST API: Add comments in the @deprecated tags.
2016-06-22 10:43:35 +02:00
Xebax
70ba8ec78d
REST API: Bring back the existing API (for backward compatibility).
...
Bring back the existing API and mark all the operations as deprecated.
Both the existing and the new API are documented and browsable with the
Restler API Explorer. The existing API appears under "root".
2016-06-22 10:08:54 +02:00
Xebax
8d86b8b37d
REST API: fix the definition of /orders/{id}/validate.
2016-06-20 17:56:33 +02:00
Xebax
571f6b8a26
REST API: replace the /order/ API by /orders/.
...
Remove the /thirdparty/{socid}/order/list endpoint because it is
redundant with the /orders/ endpoint whith the 'societe' filter.
2016-06-20 17:56:33 +02:00
Laurent Destailleur
8356dd1080
Fix minor
2016-06-20 10:22:08 +02:00
Laurent Destailleur
232f525f29
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/lib/project.lib.php
2016-06-15 18:31:43 +02:00
Laurent Destailleur
6034ba658c
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2016-06-10 18:59:05 +02:00
Laurent Destailleur
ccba65fe74
Clean dead code
2016-06-09 22:30:50 +02:00
Laurent Destailleur
544b123bdd
Fix can edit condition and mode of payment even if not draft.
2016-06-07 20:25:45 +02:00
Laurent Destailleur
5db6bcd4a8
Fix contextpage lost on submitting form or sorting
2016-06-07 14:06:00 +02:00
Laurent Destailleur
e10db62b3a
Fix a deadlock situation. If order set to billed by error, no way to
...
solve situation.
2016-06-06 13:29:37 +02:00
Laurent Destailleur
293c8e145a
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/imports/import.php
htdocs/langs/en_US/admin.lang
2016-06-05 02:20:27 +02:00
Laurent Destailleur
c09dbe05b3
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/class/ldap.class.php
htdocs/expensereport/card.php
htdocs/langs/en_US/admin.lang
2016-06-05 00:25:08 +02:00
Maxime Kohlhaas
bd2fe75d08
Fix menus in dashboard links
2016-06-04 14:45:03 +02:00
Maxime Kohlhaas
cc2b2a0baa
Don't delete link between order and shipment
2016-06-04 11:52:36 +02:00
Laurent Destailleur
b57476153f
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/admin/menus/edit.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/societe/consumption.php
2016-06-04 01:14:36 +02:00
Laurent Destailleur
085fa6902b
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/contrat/list.php
htdocs/fourn/ajax/getSupplierPrices.php
2016-06-04 00:58:16 +02:00
Laurent Destailleur
149c6916f8
FIX ##5263
2016-06-03 22:20:58 +02:00
Maxime Kohlhaas
ab44adc6d5
Fix SQL error on order stats
2016-06-02 12:37:37 +02:00
Laurent Destailleur
5106f40a56
Merge branch 'develop_NEW_decrease_stock_expedition_classify' of
...
https://github.com/atm-alexis/dolibarr into
atm-alexis-develop_NEW_decrease_stock_expedition_classify
Conflicts:
htdocs/expedition/class/expedition.class.php
2016-06-02 11:23:49 +02:00
Laurent Destailleur
028ff5e84c
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/facture/card.php
htdocs/langs/en_US/products.lang
htdocs/societe/list.php
2016-06-01 17:59:50 +02:00
Laurent Destailleur
460d7ce915
FIX Split of credit note into discount page generates records not
...
correctly recognised as credit note.
2016-05-30 19:38:28 +02:00
Laurent Destailleur
4c93340de1
Merge pull request #5232 from atm-florian/develop
...
Add trigger into expedition class
2016-05-29 13:15:35 +02:00
Laurent Destailleur
c653acd4ce
Minor fixes
2016-05-27 14:56:59 +02:00
Laurent Destailleur
a587ba496c
NEW Can select fields on supplier orders
2016-05-24 18:43:35 +02:00
florian HENRY
37d366478f
change trigger position
2016-05-23 14:18:29 +02:00
florian HENRY
8afaf07810
Merge remote-tracking branch 'origin/develop' into develop
2016-05-23 08:55:39 +02:00
Frédéric FRANCE
7048191815
Update commande.class.php
2016-05-22 08:57:23 +02:00
florian HENRY
82d6f4c808
add trigger on set draft order
2016-05-20 20:09:30 +02:00
Laurent Destailleur
e677390347
Fix bad property name
2016-05-19 22:04:36 +02:00
Laurent Destailleur
c8a8474b69
Better practice in boolean comparison
2016-05-17 23:19:57 +02:00
Alexis Algoud
8d0e5479a0
Rename var
2016-05-14 19:22:27 +02:00
Alexis Algoud
e74e70287f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_decrease_stock_expedition_classify
...
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/product/stock/replenish.php
2016-05-14 19:14:39 +02:00
Laurent Destailleur
0a5863d879
Merge pull request #5177 from simnandez/develop
...
Fix: Remove unused variables
2016-05-07 20:16:01 +02:00
Laurent Destailleur
3784af00ea
NEW Selection of fields is available on member list
2016-05-07 18:50:05 +02:00
Juanjo Menent
bba986e975
Fix Remove unused variables
2016-05-06 23:35:56 +02:00
Juanjo Menent
9e7e23a8ab
Fix Remove unused variables
2016-05-06 22:30:34 +02:00
Frédéric FRANCE
5c81feab7e
Add "no order"
2016-05-04 17:10:12 +02:00
Laurent Destailleur
b4e5acbaa9
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/product/class/product.class.php
2016-05-04 14:43:40 +02:00
Laurent Destailleur
0cde6ad98f
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/filefunc.inc.php
2016-04-29 20:43:42 +02:00
Laurent Destailleur
3d9456b202
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/fourn/facture/list.php
2016-04-29 20:42:35 +02:00
Laurent Destailleur
53386e22ea
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/expedition/class/expedition.class.php
htdocs/index.php
2016-04-29 20:39:17 +02:00
Laurent Destailleur
88842ccd8b
Merge pull request #5111 from nka11/api_improvement
...
Api improvement
2016-04-29 17:13:02 +02:00
Laurent Destailleur
174cead40d
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/commande/list.php
2016-04-29 15:33:57 +02:00
Laurent Destailleur
e723966583
FIX: Qty in stock must be float like it is in stock movement.
...
FIX: Can't create a stock transfer from product card
Performance enhancement of stock information loading.
2016-04-28 11:01:56 +02:00
nka11
932b9837fe
Merge branch 'fix_5053' into api_improvement
2016-04-28 08:31:10 +02:00
Laurent Destailleur
39bc4d5f02
Optimize load_stock and load_stock_virtual
2016-04-27 14:19:06 +02:00
Laurent Destailleur
77fcbd3884
FIX: init var at wrong place report incorrect "shippable" flag on draft
...
order.
2016-04-27 12:34:52 +02:00
Laurent Destailleur
bb91fb174b
FIX: init var at wrong place report incorrect "shippable" flag on draft
...
order.
2016-04-27 12:30:00 +02:00
nka11
98f757a87a
New API methods
...
add user to group
get product list by category id
2016-04-27 08:59:12 +02:00
Alexis Algoud
b46c14812c
Merge branch 'NEW_decrease_stock_expedition_classify' of github.com:atm-alexis/dolibarr into develop
2016-04-25 18:37:47 +02:00
Alexis Algoud
b472a244db
NEW decrease stock on expedition closing/classifying
2016-04-25 18:33:39 +02:00
Laurent Destailleur
1a883d870b
Uniformize style
2016-04-23 17:35:33 +02:00
Laurent Destailleur
5bfc65676c
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
ChangeLog
htdocs/commande/class/commande.class.php
htdocs/filefunc.inc.php
htdocs/theme/eldy/style.css.php
2016-04-22 21:02:20 +02:00
Maxime Kohlhaas
4bd239060c
Fix order creation bug because of ->client
2016-04-22 09:18:09 +02:00
Laurent Destailleur
8a6d97f257
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-21 02:39:37 +02:00
Laurent Destailleur
ffd10a7560
Complete function loadExpedition to add filter on fk_product
2016-04-21 02:38:49 +02:00
Laurent Destailleur
1e5ff7388c
Merge pull request #5031 from marcosgdf/refactor-deprecated-co-client
...
NEW Removed deprecated CommonObject::client property
2016-04-21 01:49:12 +02:00
Florian HENRY
79f408feeb
FIX : When cloning an order the order result from clone must be now
2016-04-20 17:17:03 +02:00
nka11
39948968eb
Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into api_dev
2016-04-18 19:13:06 +02:00
nka11
4eb1aa59aa
fix coding rules
2016-04-18 19:11:28 +02:00
Marcos García de La Fuente
e2c86d3fd8
NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead
2016-04-17 15:24:22 +02:00
Laurent Destailleur
357877b1fe
Debug multicurrency and clean properties of some modules
2016-04-12 14:45:59 +02:00
nka11
9ced1dc008
fixing some style and renaming Account to User API
2016-04-11 23:27:43 +02:00
nka11
e5a447c148
Adding more line features (PUT, DELETE, POST)
2016-04-11 22:41:35 +02:00
nka11
1fdcd0e859
Fixed bugs in order api. Added method for posting new lines in order
2016-04-11 18:07:02 +02:00
nka11
132cdd9ed4
Fix coding style errors
2016-04-10 14:15:38 +02:00
nka11
65e4273fdf
Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into api_dev
2016-04-10 14:00:00 +02:00
nka11
d0356d6bd0
new api class for accounts, filtering on order api
2016-04-10 13:57:53 +02:00
Laurent Destailleur
dd1f946afe
Clean dead code
2016-04-09 19:06:40 +02:00
Laurent Destailleur
27217ccccd
Maxi debug of supplier order workflow.
...
Add trigger ORDER_SUPPLIER_CLASSIFY_BILLED
Parameter user is added so it is defined into triggers.
2016-04-09 18:51:09 +02:00
Scrutinizer Auto-Fixer
c2243909e9
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-04-09 13:07:33 +00:00
Laurent Destailleur
1b04eabf1f
Merge log with events tabs
2016-04-08 14:28:49 +02:00
Laurent Destailleur
7a48ceb635
Uniformize code for mass actions
2016-04-08 02:53:10 +02:00
Laurent Destailleur
8222624ff0
NEW Can select fields to show on list also for list of customer orders,
...
shipments and invoices.
2016-04-08 02:39:57 +02:00
Laurent Destailleur
24c91933d0
Work on select fields for orders, invoices and shipments
2016-04-08 01:00:02 +02:00
Laurent Destailleur
086345490d
Generalize the set of trackid for everyemail sent by dolibarr.
2016-04-07 14:29:07 +02:00
Laurent Destailleur
e1bec46a34
FIX The include file for action on files should not be a template file
...
but an action include file.
2016-04-02 14:16:16 +02:00
Laurent Destailleur
281b06a2d3
NEW Introduce option MAIN_WEIGHT_DEFAULT_UNIT and
...
MAIN_VOLUME_DEFAULT_UNIT to force output unit for weight and volume.
2016-04-01 18:44:23 +02:00
Laurent Destailleur
d14f3d7e2b
FIX When deleting last shipment, status "shipment in progress" of order
...
must move back to status "validated".
2016-04-01 16:59:08 +02:00
Laurent Destailleur
97b5026ad8
Uniformize code and css
2016-04-01 16:18:45 +02:00
Laurent Destailleur
2d9c53fc26
NEW Merge all boxes "related objects" into one. This save a lot of room
...
on most card and avoid often horizontal scoll.
2016-03-30 19:18:31 +02:00
Laurent Destailleur
91caea5707
Code was corrupted with very bad commits. I restore files manually.
2016-03-25 15:53:44 +01:00
Laurent Destailleur
630f5a632d
Revert "Corrected non-static usages of Form::selectarray function"
...
This reverts commit 87cd6e1e40
2016-03-25 15:34:37 +01:00
Laurent Destailleur
8ecfca5a9e
Revert change that break compatiblity with 100% of modules
2016-03-25 15:26:46 +01:00
Laurent Destailleur
26de415b77
Revert commit that break compatibility of 100% of modules
2016-03-25 15:24:57 +01:00
Marcos García de La Fuente
89bd173c2f
NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate
2016-03-21 21:51:29 +01:00
Marcos García de La Fuente
5a046125db
Missing changes from previous commits
2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
ff6b187ef3
NEW Converted Form::showLinkedObjectBlock to a static function
2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
4d78932fe8
NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions
2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
87cd6e1e40
Corrected non-static usages of Form::selectarray function
2016-03-20 14:15:17 +01:00
Laurent Destailleur
ba4f5c8648
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-19 19:26:57 +01:00
Laurent Destailleur
ee857055be
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-03-19 19:26:25 +01:00
Laurent Destailleur
660f825a34
Fix regression description line not visible
2016-03-19 19:25:28 +01:00
Laurent Destailleur
2b1f57f01e
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
dev/initdata/savedemo.sh
htdocs/filefunc.inc.php
htdocs/user/card.php
2016-03-18 11:54:14 +01:00
Laurent Destailleur
7fa71214bc
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
htdocs/core/modules/commande/doc/pdf_proforma.modules.php
2016-03-18 11:06:41 +01:00
Laurent Destailleur
dc78cc7ced
Merge pull request #4837 from hregis/3.9_order
...
Fix: missing model selected
2016-03-18 00:10:30 +01:00
Regis Houssin
2642b710ea
Fix: missing model selected
2016-03-17 15:56:03 +01:00
philippe grand
a196a76132
Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9
2016-03-17 09:21:32 +01:00
Laurent Destailleur
1ded08abef
FIX When using option Price per level, when adding a predefined product,
...
the vat for customer was not correctly set.
2016-03-15 21:02:45 +01:00
fappels
437470c3d9
subprice should be unit price without tax
2016-03-14 17:27:12 +01:00
Laurent Destailleur
08c5fd2e36
FIX #4809 - Duplicate functions with different content
2016-03-14 14:38:30 +01:00
Laurent Destailleur
543f5cef63
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
dev/initdata/initdemo.sh
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/commande/card.php
htdocs/compta/facture.php
2016-03-13 01:31:12 +01:00
philippe grand
adc552d5ff
Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9
2016-03-12 20:52:09 +01:00
philippe grand
df1c5697be
[fix]: define to avoid issue with external pdf models
2016-03-12 19:07:56 +01:00
Laurent Destailleur
e0809fc750
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
ChangeLog
build/makepack-dolibarr.pl
htdocs/compta/facture.php
htdocs/product/document.php
2016-03-12 18:40:50 +01:00
Regis Houssin
7953f77b07
Fix: $fileparams is not defined
2016-03-11 18:08:27 +01:00
Laurent Destailleur
4fa84c8d8f
Merge pull request #4707 from marcosgdf/misc2
...
Removed deprecated usage of Account::account_currency_code and started using Account::canBeReconciliated
2016-03-10 13:21:51 +01:00
Laurent Destailleur
ba5b0efb53
The warning for late orders is visible on order card
2016-03-10 10:53:01 +01:00
Laurent Destailleur
09a29322c3
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/customer/list.php
htdocs/accountancy/supplier/list.php
htdocs/commande/orderstoinvoice.php
htdocs/public/demo/index.php
htdocs/societe/commerciaux.php
2016-03-08 17:40:21 +01:00
Laurent Destailleur
71246c864a
FIX Bad td balance and default checkbox value
2016-03-08 17:31:46 +01:00
Laurent Destailleur
d1777a6783
Replace function rand with mt_rand (prepare php 8)
2016-03-05 15:01:25 +01:00
Laurent Destailleur
446a080c75
NEW Mutualize code to manage email substitution variables. Show
...
available variables into page to edit email templates.
2016-03-05 12:20:58 +01:00
Ion Agorria
a1159b6f29
Fix: unset date start/end at success
2016-03-04 14:11:06 +01:00
Laurent Destailleur
3a58613e45
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/listbyyear.php
htdocs/accountancy/journal/bankjournal.php
htdocs/compta/facture/list.php
htdocs/filefunc.inc.php
htdocs/fourn/facture/list.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/projet/activity/index.php
2016-03-02 23:40:11 +01:00
Marcos García de La Fuente
66313f584b
Removed deprecated usage of Account::account_currency_code and started using Account::canBeReconciliated
2016-03-02 10:52:54 +01:00
Laurent Destailleur
5453f99e2e
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/comm/prospect/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
2016-02-27 18:33:39 +01:00
Laurent Destailleur
8807222f24
Fix a lot of fixes to have the french vat npr working better
2016-02-27 12:22:39 +01:00
Laurent Destailleur
c86a1a30d5
Fix a lot of fixes to have the french vat npr working better
2016-02-27 11:46:16 +01:00
fmarcet
30d6aa0b96
FIX: Some filters are lost when paging
2016-02-26 13:14:23 +01:00
Laurent Destailleur
8927948bef
NEW Add option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN
2016-02-25 16:27:28 +01:00
Laurent Destailleur
59a6cb5f55
Fix bad support of option WORKFLOW_BILL_ON_SHIPMENT
...
Conflicts:
htdocs/commande/list.php
2016-02-25 03:06:37 +01:00
Laurent Destailleur
96305ca00f
Fix bad support of option WORKFLOW_BILL_ON_SHIPMENT
2016-02-25 03:04:36 +01:00
Laurent Destailleur
9900620695
uniformize labels
2016-02-25 02:05:28 +01:00
Laurent Destailleur
4b89b0b7aa
Fix bad status translation for shipment
2016-02-24 22:13:29 +01:00
Laurent Destailleur
6ee4637f35
Fix bad status translation for shipment
2016-02-24 22:12:38 +01:00
Laurent Destailleur
d3960b0809
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/lib/member.lib.php
htdocs/expedition/card.php
2016-02-20 04:25:39 +01:00
Laurent Destailleur
2e27319d1b
Fix Removed not expected br
2016-02-20 03:42:29 +01:00
Laurent Destailleur
761ad0114c
Merge pull request #4641 from atm-ph/new_add_multicurrency_supplier_proposal_order
...
New add multicurrency on supplier proposal/order
2016-02-19 03:36:23 +01:00
phf
e24a35b904
New add multicurrency on supplier proposal/order
2016-02-16 23:58:21 +01:00
phf
6d095fce9f
Fix replace dol_include_once() function by require_once for internal module
2016-02-16 20:44:23 +01:00
abb
3e6eca546a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev
...
Conflicts:
htdocs/fichinter/card.php
htdocs/langs/en_US/products.lang
2016-02-15 00:06:51 +01:00
Laurent Destailleur
6662c1b5e1
NEW Can select dynamicaly number of lines to show on page on product,
...
shipment, contact, orders, thirdparties
Fix can make a shipment for product not predefined in multiwarehouse
mode
2016-02-10 23:37:34 +01:00
Laurent Destailleur
5ea9c6dd83
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/core/class/html.formprojet.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/accountancy.lang
2016-02-09 14:40:25 +01:00
Laurent Destailleur
223195538a
Return bad late or not status for order
2016-02-09 14:29:12 +01:00
Laurent Destailleur
d2708a4225
Merge pull request #4475 from atm-ph/new_multicurrency_module
...
New multicurrency module
2016-02-08 14:44:49 +01:00
Laurent Destailleur
9da0164d90
Uniformize code for lists
2016-02-07 15:50:48 +01:00
phf
1b552a0b3b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module
...
Conflicts:
htdocs/core/class/link.class.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-03 18:30:59 +01:00
fmarcet
acc9879c7c
FIX: It doesn't check if there is enough stock to update the lines of orders/invoices
2016-02-01 13:05:14 +01:00
Laurent Destailleur
e3a4124a58
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/card.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/langs/fr_FR/bills.lang
2016-01-30 16:13:06 +01:00
Laurent Destailleur
5e9fd25a6e
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-01-30 15:59:40 +01:00
Regis Houssin
8a80e06580
Fix: missing field "label"
2016-01-28 11:42:00 +01:00
phf
83f90e2b1f
Merge branch 'new_multicurrency_module' of github.com:atm-ph/dolibarr into new_multicurrency_module
...
Conflicts:
htdocs/commande/card.php
2016-01-25 21:50:43 +01:00
Frédéric FRANCE
9909918078
Text not initialized
2016-01-25 13:52:35 +01:00
Laurent Destailleur
274caf61eb
NEW Add statistics for interventions module
2016-01-25 13:34:05 +01:00
Laurent Destailleur
467dc12a7b
NEW Module "Supplier commercial proposal" (price request) is set to
...
stable status.
2016-01-25 12:33:38 +01:00
phf
373225272b
FIX reorder the display of currency and rate on propal/order
...
FIX update line on propal/order
NEW add mulitcurrency on customer invoice
2016-01-23 16:01:55 +01:00
phf
e86ebd6799
NEW add multicurency on customer order
2016-01-23 00:38:17 +01:00
Laurent Destailleur
ddd8f8586f
Fix rewrite of project and task list to solve bad listing
...
Fix correct sort and pagination of lists
2016-01-21 14:59:09 +01:00
Laurent Destailleur
8e882b4cc2
NEW Add warning on tasks when they are late (add also the warning
...
tolerance parameter)
2016-01-18 15:56:51 +01:00
