Laurent Destailleur
|
cffea1889f
|
FIX #16325
|
2021-03-02 01:17:28 +01:00 |
|
Laurent Destailleur
|
886cbc61c8
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/commande/card.php
htdocs/core/boxes/box_factures_fourn.php
htdocs/core/boxes/box_factures_fourn_imp.php
htdocs/core/boxes/box_ficheinter.php
htdocs/core/boxes/box_members.php
htdocs/core/boxes/box_propales.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formmail.class.php
htdocs/core/lib/functions.lib.php
htdocs/fourn/class/fournisseur.facture.class.php
|
2021-02-28 13:37:45 +01:00 |
|
Laurent Destailleur
|
2ce76133f4
|
FIX #16487
|
2021-02-28 12:59:58 +01:00 |
|
Laurent Destailleur
|
5c0ea476e1
|
Look and feel v14
|
2021-02-27 12:45:07 +01:00 |
|
Frédéric FRANCE
|
6dfca9f1f5
|
code syntax commande directory
|
2021-02-23 20:46:19 +01:00 |
|
Laurent Destailleur
|
bfe71e8509
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-02-17 14:28:19 +01:00 |
|
ptibogxiv
|
39b29a7d68
|
Fix set date delivery on create order form
|
2021-02-16 17:40:00 +01:00 |
|
Frédéric FRANCE
|
2c6656b2ad
|
Update card.php
|
2021-02-09 18:07:21 +01:00 |
|
Frédéric FRANCE
|
fb4aea8223
|
Update card.php
|
2021-02-09 18:02:41 +01:00 |
|
Laurent Destailleur
|
a84bc05f01
|
Merge pull request #16146 from FHenry/12_fix_pricemin_PRODUIT_CUSTOMER_PRICES
FIX: manage price min for PRODUIT_CUSTOMER_PRICES
|
2021-02-09 13:39:25 +01:00 |
|
Laurent Destailleur
|
89bda722bf
|
Merge pull request #16232 from frederic34/paymentvat
use camelCaps name
|
2021-02-09 13:29:40 +01:00 |
|
Frédéric FRANCE
|
e2d2048522
|
deprecate non camelCaps functions
|
2021-02-09 13:25:55 +01:00 |
|
Laurent Destailleur
|
401b4f641d
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/commande/card.php
|
2021-02-08 22:13:50 +01:00 |
|
Laurent Destailleur
|
6e6b5973b8
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
|
2021-02-08 17:35:44 +01:00 |
|
Laurent Destailleur
|
8b3c872f2a
|
Fix warning
|
2021-02-08 17:35:21 +01:00 |
|
Florian Mortgat
|
ff3707b650
|
FIX: warning when adding a line if $remise_percent is an empty string
|
2021-02-08 17:24:40 +01:00 |
|
Laurent Destailleur
|
2e7de1d137
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/commande/card.php
test/phpunit/ExportTest.php
|
2021-02-02 16:17:53 +01:00 |
|
Laurent Destailleur
|
c5201b95bb
|
FIX Must not be able to edit vat of all lines if not draft
|
2021-02-02 16:12:03 +01:00 |
|
Florian HENRY
|
d3d0617996
|
fix: manage price min for PRODUIT_CUSTOMER_PRICES
|
2021-02-02 13:43:33 +01:00 |
|
Laurent Destailleur
|
7887d4cc8e
|
Fix price2num on all GETPOST('remise_percent')
|
2021-01-31 12:48:40 +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
|
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
|
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 |
|
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 |
|
Florian HENRY
|
dfaf77b03f
|
merge develop
|
2021-01-03 15:14:34 +01:00 |
|
Laurent Destailleur
|
1ab459e854
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-01-02 16:19:08 +01:00 |
|
Laurent Destailleur
|
ce0abd17fe
|
Debug v13
|
2021-01-02 16:18:16 +01:00 |
|
Laurent Destailleur
|
a6eb14f68b
|
Merge pull request #15585 from cfoellmann/fckeditor-notes
NEW Can toggle FCKeditor on public/private notes
|
2020-12-27 15:06:35 +01:00 |
|
Laurent Destailleur
|
acb73966f7
|
Clean code. Removed phpexcel library.
|
2020-12-13 16:27:44 +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
|
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 |
|
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 |
|
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
|
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
|
187ba94a57
|
Look and feel v13
|
2020-11-26 14:24:52 +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 |
|
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 |
|
Florian HENRY
|
46326d7659
|
merge from develop
|
2020-11-19 13:53:34 +01:00 |
|
Laurent Destailleur
|
6c42535eb2
|
Maxi debug v13
|
2020-11-16 12:20:18 +01:00 |
|
Laurent Destailleur
|
90884d8085
|
Fix compatibility with date_delivery
|
2020-11-11 18:08:40 +01:00 |
|
Laurent Destailleur
|
1d90ee2765
|
FIX #15336 set_thirdparty was not used anymore. Removed dead code.
|
2020-11-09 15:28:18 +01:00 |
|
Laurent Destailleur
|
9e967a578e
|
FIX #14985 - I vertion option RELOAD_PAGE_ON_CUSTOMER_CHANGE
|
2020-11-03 02:17:51 +01:00 |
|
Scrutinizer Auto-Fixer
|
7f52920716
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-31 13:32:18 +00:00 |
|
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 |
|
Frédéric FRANCE
|
5a3780e062
|
end of dol_fiche_end
|
2020-10-27 18:19:31 +01:00 |
|
Francis Appels
|
7fa7f0a390
|
Re-add set_date_livraison as a deprecated function.
Use correct naming convention for new method naming.
|
2020-10-26 16:50:52 +01:00 |
|
Florian HENRY
|
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
|
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 |
|
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
|
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 |
|
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
|
7b3a7c9921
|
Add token on all url with action=delete
|
2020-10-01 10:50:54 +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 |
|
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 |
|
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
|
b8fe2188a6
|
Standardize code around model_pdf
|
2020-09-10 01:49:09 +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
|
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 |
|
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 |
|
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 |
|
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
|
1121d2c1c6
|
Look and feel v12
|
2020-04-25 13:49:44 +02:00 |
|
Laurent Destailleur
|
72c6ac1c72
|
Complete #13708, normalization of code
|
2020-04-23 13:21:39 +02:00 |
|
Laurent Destailleur
|
fe674f08d9
|
Fix option WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER
|
2020-04-20 03:00:10 +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 |
|
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
|
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
|
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
|
56d6c4691f
|
FIX #13382 Note will be concat to private note
|
2020-03-18 21:06:36 +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 |
|
Laurent Destailleur
|
18b99254a1
|
Experiment ORDER_ENABLE_NEGATIVE
|
2020-02-18 20:55:22 +01:00 |
|
Laurent Destailleur
|
3a9e238dc6
|
FIX Missing value of $formconfirm as parameters of hook
|
2020-01-28 12:00:27 +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
|
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 |
|
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 |
|
Laurent Destailleur
|
2689f7515c
|
Fix pb with colspan and extrafields.
Fix remove empty id
|
2019-11-16 14:38:05 +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
|
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
|
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 |
|
Frédéric FRANCE
|
e93aaa2a75
|
replace deprecated user->societe_id by user->socid
|
2019-10-31 20:46:31 +01:00 |
|
Laurent Destailleur
|
2201b11fd3
|
NEW Add option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_SALE_PROPOSAL
NEW Add option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_PROPOSAL
|
2019-10-24 13:41:04 +02:00 |
|
Frédéric FRANCE
|
66b0c27645
|
clean indent in commande dir
|
2019-10-20 09:58:31 +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
|
e94d47daf7
|
Work on MRP module
|
2019-10-15 19:57:23 +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
|
b6882af1b6
|
Add hidden options to send by email for all status
|
2019-10-03 20:21:13 -05:00 |
|
Alexandre SPANGARO
|
16c6c9ae75
|
Merge remote-tracking branch 'upstream/develop' into 11.0_https
|
2019-10-01 06:12:24 +02:00 |
|
Alexandre SPANGARO
|
aec50d3ac9
|
NEW Add fa_icon on load_fiche_titre
|
2019-09-30 10:14:55 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +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
|
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
|
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 |
|
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
|
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 |
|
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 |
|
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
|
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
|
fa476b4994
|
Properties ->libelle_incoterms were renamed into ->label_incoterms
|
2019-06-25 13:00:02 +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
|
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
|
b73df2698d
|
FIX better compatibility with Multicompany
|
2019-05-12 14:25:41 +02:00 |
|
Laurent Destailleur
|
a94c291b76
|
Dolibarization
|
2019-05-09 16:59:06 +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
|
e6ffaeefe5
|
CSS
|
2019-04-17 10:39:30 +02:00 |
|
Laurent Destailleur
|
f27f65e8bf
|
Responsive
|
2019-03-25 10:09:02 +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 |
|
Christophe Battarel
|
8b3fd2eacf
|
NEW : add constant NO_CONCAT_DESCRIPTION
|
2019-03-18 16:10:17 +01:00 |
|
Laurent Destailleur
|
c0b6699b25
|
All methods set_draft() were renamed into setDraft()
|
2019-03-15 19:01:40 +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 |
|
Joan Louis
|
ee5753819e
|
Update call to extrafields from cards
|
2019-03-11 14:22:04 +01:00 |
|
Laurent Destailleur
|
3ec2338c2d
|
Look and feel v10
|
2019-02-26 19:37:32 +01:00 |
|
Frédéric FRANCE
|
1e43f8e54a
|
PEAR FunctionCallSignature
|
2019-02-10 10:45:49 +01:00 |
|
Frédéric FRANCE
|
b10558bacd
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-27 23:23:38 +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 |
|
Laurent Destailleur
|
5130019003
|
css
|
2019-01-17 19:27:26 +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
|
3571eaee3d
|
Merge branch 'develop' into NEW_change_order_concat_desc
|
2018-12-14 17:44:08 +01:00 |
|
Laurent Destailleur
|
2011afe6fb
|
Merge branch 'develop' into actionrefused
|
2018-12-14 15:48:24 +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 |
|
Thibault Descamps
|
1cc130e5f6
|
NEW : conf to change concat desc order
|
2018-11-21 09:57:44 +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
|
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 |
|
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
|
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
|
3e71f4e6b0
|
Merge remote-tracking branch 'upstream/develop' into patch-6
|
2018-09-12 18:36:49 +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
|
a3fa13994b
|
replace select_date
|
2018-09-09 09:36:12 +02:00 |
|
Laurent Destailleur
|
ff05997f0a
|
FIX Several fixes on the management of minimal amount for orders
|
2018-09-06 17:37:02 +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 |
|
Laurent Destailleur
|
f1cb13634b
|
FIX Entering negative price on order
|
2018-09-05 14:55:45 +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 |
|
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 |
|
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 |
|
Frédéric FRANCE
|
9025c452ef
|
Merge remote-tracking branch 'upstream/develop' into trimtrailing
|
2018-08-07 16:40:03 +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 |
|
Philippe GRAND
|
2a6f050e32
|
Clean and update code
|
2018-07-24 18:28:56 +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
|
edd7499375
|
Fix clone with new architecture
|
2018-06-19 09:21:23 +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 |
|
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
|
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 |
|
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 |
|
atm-quentin
|
ec5e84075e
|
NEW Rights to ignore price min
|
2018-05-03 10:18:38 +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
|
be965bdbab
|
Clean code
|
2018-04-13 13:28:48 +02:00 |
|
Laurent Destailleur
|
1521b0595b
|
Clean code
|
2018-04-13 11:03:03 +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 |
|
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
|
3b55049895
|
Dolibarrize module ticket
|
2018-03-22 10:23:25 +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 |
|
Regis Houssin
|
ea175cd6c1
|
Fix: compatibility with multicompany dictionnary sharing
|
2018-03-09 09:37:23 +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 |
|
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
|
0a79550f43
|
Fix oldcopy must be saved before update_extras
|
2018-02-23 16:11:00 +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 |
|
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 |
|
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
|
b3df7670e9
|
Merge pull request #7999 from frederic34/propalweight
NEW display weight volume in propal
|
2018-02-03 16:58:58 +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
|
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 |
|
Frédéric FRANCE
|
33f6ba19da
|
display weight volume in propal
|
2017-12-28 16:20:08 +01:00 |
|
Laurent Destailleur
|
f1305bbdd6
|
Fix css
|
2017-12-20 21:14:22 +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 |
|
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
|
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
|
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
|
b5196b7164
|
FIX A lot of several fix on local taxes and NPR tax
|
2017-11-13 14:24:40 +01:00 |
|
Laurent Destailleur
|
bac6a434f4
|
Add link to make a direct download on card
|
2017-11-04 17:11:58 +01: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
|
f24204c79a
|
Error management after extrafield update
|
2017-10-24 19:04:40 +02:00 |
|
TuxGasy
|
9c3805c0d5
|
Fix anchor after add line
|
2017-10-19 14:10:58 +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
|
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 |
|
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 |
|
Laurent Destailleur
|
7c9993ef0e
|
Various fixes
|
2017-10-13 12:14:57 +02:00 |
|
Rui Strecht
|
666e62b440
|
Fixed issue with inexistent constant in commande STATUS_ACCEPTED
|
2017-10-09 17:54:15 +01:00 |
|
Laurent Destailleur
|
2f20de2457
|
Fix cancel button on create
|
2017-10-03 14:57:38 +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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
Laurent Destailleur
|
7aa09d8b71
|
NEW Can create thirdparty from card proposal, order or invoice
|
2017-08-28 18:37:16 +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
|
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 |
|
hguibourgdev
|
2166b3d467
|
Update card.php
FIX "!" is missing on test : empty($object->date_livraison)
|
2017-07-15 12:04:59 +02:00 |
|
Laurent Destailleur
|
7ae52d843c
|
Look and feel v6
|
2017-07-01 14:23:24 +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 |
|
Laurent Destailleur
|
5b7a8e9c90
|
Fix missing signature when sending email from user card
|
2017-06-17 10:17:36 +02:00 |
|
Laurent Destailleur
|
a96362e2f9
|
Fix #formmailbeforetitle not supported everywhere
|
2017-06-11 11:40:01 +02:00 |
|
Laurent Destailleur
|
e93cefbbf0
|
FIX #6985
|
2017-06-11 10:37:58 +02:00 |
|
Laurent Destailleur
|
7c0de18ac1
|
Fix code comment
|
2017-06-10 12:56:28 +02:00 |
|
Laurent Destailleur
|
1820649175
|
Maxi debug of v6
|
2017-06-07 19:28:31 +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
|
ff5d682d49
|
Fix css
|
2017-05-18 03:12:29 +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 |
|
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 Destailleur
|
3917bdfc79
|
Fix vat_src_code propagation.
|
2017-05-02 22:37:43 +02:00 |
|
Laurent Destailleur
|
3e9ccc186a
|
NEW Small PDF template for products
|
2017-04-13 10:26:12 +02:00 |
|
Laurent Destailleur
|
f843f8a93d
|
Start to move search bar before table titles
|
2017-03-27 00:48:50 +02: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 |
|
Laurent Destailleur
|
68e50d0c79
|
FIX Filter on date lost after submit on time spent page
|
2017-03-16 10:36:17 +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
|
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
|
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
|
d09a3628c5
|
Merge branch 'develop' into prod-attr
# Conflicts:
# htdocs/compta/facture.php
|
2017-01-14 23:59:14 +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
|
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 |
|
phf
|
cca7967144
|
Merge branch 'fix_user_right_write_margin' into fix_develop_user_right_write_margin
|
2016-12-15 16:19:54 +01:00 |
|
phf
|
21a648a052
|
Fix user right on margin module to write buyprice
|
2016-12-15 12:01:46 +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 |
|
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
|
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
|
2a8f23e8c5
|
Fix labels
|
2016-12-06 15:03:39 +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
|
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
|
62e0d4ec3f
|
FIX Several problems into shipment management with lot enabled
|
2016-11-14 14:34:15 +01:00 |
|
Laurent Destailleur
|
35d80aa209
|
Miscellaneous fixes
|
2016-11-12 12:40:06 +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
|
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 |
|
Sergio Sanchis Climent
|
8556dab68e
|
NEW: #5830
|
2016-10-13 16:44:17 +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
|
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 |
|
florian HENRY
|
5a8f0491b3
|
wotk on declaration method OrderLine
|
2016-09-26 09:34:51 +02:00 |
|
Laurent Destailleur
|
ea09eb13da
|
Uniformize code
|
2016-09-26 00:10:29 +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
|
0ab377440d
|
Complete param of setValueFrom
|
2016-09-12 20:16:39 +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 |
|
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
|
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 |
|
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
|
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
|
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
|
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
|
857de64607
|
Fix multicurrency
|
2016-07-30 16:41:10 +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 |
|
Marcos García de La Fuente
|
c082505021
|
NEW Added product attributes feature
|
2016-07-24 11:27:52 +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
|
59f86a12d2
|
Fix delete of documents generated on project.
Fix missin translation
|
2016-07-01 17:49:13 +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
|
544b123bdd
|
Fix can edit condition and mode of payment even if not draft.
|
2016-06-07 20:25:45 +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
|
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
|
1a883d870b
|
Uniformize style
|
2016-04-23 17:35:33 +02:00 |
|
Maxime Kohlhaas
|
4bd239060c
|
Fix order creation bug because of ->client
|
2016-04-22 09:18:09 +02:00 |
|
Laurent Destailleur
|
357877b1fe
|
Debug multicurrency and clean properties of some modules
|
2016-04-12 14:45:59 +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 |
|
Laurent Destailleur
|
1b04eabf1f
|
Merge log with events tabs
|
2016-04-08 14:28:49 +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
|
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
|
97b5026ad8
|
Uniformize code and css
|
2016-04-01 16:18:45 +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
|
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
|
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 |
|
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
|
ba5b0efb53
|
The warning for late orders is visible on order card
|
2016-03-10 10:53:01 +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
|
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 |
|
Laurent Destailleur
|
8927948bef
|
NEW Add option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN
|
2016-02-25 16:27:28 +01:00 |
|
Laurent Destailleur
|
9900620695
|
uniformize labels
|
2016-02-25 02:05:28 +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 |
|
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 |
|
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 |
|
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
|
f25a9030eb
|
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
.travis.yml
htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
htdocs/core/modules/commande/doc/pdf_proforma.modules.php
htdocs/includes/adodbtime/adodb-time.inc.php
htdocs/langs/en_US/accountancy.lang
|
2015-12-18 22:12:03 +01:00 |
|
phf
|
c215898c52
|
FIX label of line is set in description field if empty
|
2015-12-18 17:11:14 +01:00 |
|
abb
|
1bde35f98e
|
add change customer function in customer orders
|
2015-12-13 12:10:43 +01:00 |
|
Ion Agorria
|
1dc5854535
|
Fix date handling for hours/mins in some pages
|
2015-12-07 03:59:03 +01:00 |
|
Laurent Destailleur
|
a12e959833
|
Do not show billed status after order status
|
2015-11-29 16:33:50 +01:00 |
|
frederic34
|
e0ee6718ad
|
Select warehouse on order card
|
2015-11-15 11:42:47 +01:00 |
|