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
2cf630c213
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-05-20 16:10:47 +02:00
florian HENRY
02af7ca25e
fix pb with multicompny payment dictionnary on faxcture card
2019-05-18 12:11:28 +02:00
Regis Houssin
b73df2698d
FIX better compatibility with Multicompany
2019-05-12 14:25:41 +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
Francis Appels
d08db86ba1
Fix customer order updateline
2019-04-11 18:55:16 +02:00
Laurent Destailleur
7b01e76d2b
Fix doxygen
2019-04-08 16:04:15 +02: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
Ion
7bfa49b29c
FIX: Disallow line start date > end date
2019-03-24 14:30:00 +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
Philippe GRAND
c13a1dbc63
translation
2019-03-18 13:45:24 +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
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
5fd3a253ab
add new dolGetStatus to LibStatut in order class
2019-03-06 14:19:40 +01:00
Frédéric FRANCE
796ea6f4ea
add visibility
2019-02-28 23:19:58 +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
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
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
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
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
Laurent Destailleur
9fb672d51b
Merge pull request #10127 from atm-florian/develop_scrunitizer
...
fix scrunitizer
2018-12-14 17:28:34 +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
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
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
Regis Houssin
569d59d251
FIX change my deprecated email
2018-10-27 14:43:12 +02:00
Frédéric FRANCE
a30091fd74
Update commande.class.php
2018-10-27 09:51:19 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
2018-10-24 23:04:26 +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
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
Frédéric FRANCE
2b62c4ca8f
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-08 10:50:27 +02:00
Frédéric FRANCE
4e619dd0ed
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-05 18:51:21 +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
Philippe GRAND
f77dd2ebc7
Standardize and update code
2018-09-01 15:13:59 +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
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
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
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
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
850ac34020
mark non camelCaps function
2018-08-13 17:26:32 +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
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
12e21b4886
FIX update extrafields
2018-08-12 16:29:26 +02:00
atm-quentin
6662bf05ba
FIX hook on update price AND fix id on line
2018-08-03 11:47:43 +02:00
Frédéric FRANCE
0952cf5e2b
fix no link in order list
2018-07-26 10:43:50 +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
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
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
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
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
Frédéric FRANCE
e2a557aadd
limit length of lines to 500 chars
2018-05-27 15:04:12 +02:00
Laurent Destailleur
0d0da234b1
Lowercase NULL, TRUE, FALSE according to PSR2
2018-04-16 13:51:16 +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
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
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
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
93a9430e49
Fix: regression, restore primary key
2018-03-08 07:41:54 +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
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
003827eb06
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-25 15:01:19 +01:00
Regis Houssin
703d976b3b
Fix: missing object entity in fetch
2018-02-24 16:21:16 +01:00
Laurent Destailleur
b4446764f8
Clean code of deprecated usage
2018-02-21 14:48:25 +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
Laurent Destailleur
89dc208072
Fix fk_account not into update
2018-01-30 17:00:17 +01:00
Laurent Destailleur
0fb95fa15f
Try a fix for #7778
2018-01-05 01:30:12 +01:00
Laurent Destailleur
aad0da2513
Fix maxi debug of APIs (clean output fields)
2017-12-21 16:50:18 +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
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
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
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
1a5bbef266
FIX Locatax were not propagated when cloning order or proposal
2017-11-13 13:07:31 +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
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
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
9283aaf6aa
Fix scrutinizer
2017-10-27 00:07:58 +02:00
Laurent Destailleur
202712be94
Work on module builder
2017-10-25 22:02:07 +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
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
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
45ac8367bd
NEW Add API for contracts
2017-10-16 17:56:59 +02:00
Laurent Destailleur
051d49732d
Keep compatiblity of status key
2017-10-11 11:36:24 +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
c22cd1cfe9
Fix test on entity must always be done using the "IN" instead of "="
2017-10-03 17:41:22 +02:00
Regis Houssin
9823d6622c
Fix: use default $shared value
2017-09-27 17:40:02 +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
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
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
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
Regis Houssin
200f232164
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-16 07:51:20 +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
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
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
Regis Houssin
5c5663c5ae
New: getEntity function use true $shared value by default
2017-05-30 18:50:54 +02:00
Laurent Destailleur
b0f0285137
Standardize code
2017-05-16 21:29:18 +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
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
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
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
Maxime Kohlhaas
402924f6d7
Fix : no origin on stock mvmt when order set back to draft
2017-04-14 15:12:32 +02:00
philippe grand
c3387cb4e6
ref column was missing for specimen and some update
2017-04-11 14:54:34 +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
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
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
phf
f5bffeb535
New get multicurrency rate from document date (propal, order)
2016-12-11 16:30:01 +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
Maxime Kohlhaas
0302e8c1f8
Missing comment
2016-12-11 09:29:20 +01:00
Maxime Kohlhaas
d426ab04f0
Multicurrency on proposal and order
2016-12-11 00:42:52 +01:00
Laurent Destailleur
017b18d5c6
Fix #6037 #6041
2016-11-27 16:09:16 +01:00
Laurent Destailleur
c1628be9c0
Code comment to add some explanations
2016-11-23 12:29:42 +01:00
Laurent Destailleur
ecbe719f23
FIX Several problems into shipment management with lot enabled
2016-11-14 13:40:41 +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
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
6ef74b33c9
Uniformize code
2016-10-25 11:09:26 +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
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
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
1b00d55021
NEW New set of icon for status easier to understand.
2016-09-10 17:57:35 +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
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
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
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
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
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
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
ccba65fe74
Clean dead code
2016-06-09 22:30:50 +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
Laurent Destailleur
149c6916f8
FIX ##5263
2016-06-03 22:20:58 +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
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
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
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
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
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
Florian HENRY
79f408feeb
FIX : When cloning an order the order result from clone must be now
2016-04-20 17:17:03 +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
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
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
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
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
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
d1777a6783
Replace function rand with mt_rand (prepare php 8)
2016-03-05 15:01:25 +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
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
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
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
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
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
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
8e882b4cc2
NEW Add warning on tasks when they are late (add also the warning
...
tolerance parameter)
2016-01-18 15:56:51 +01:00
Laurent Destailleur
6f474c403c
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/filefunc.inc.php
htdocs/product/list.php
htdocs/societe/notify/card.php
htdocs/societe/price.php
2015-12-27 19:15:20 +01:00
Laurent Destailleur
80989fd2c9
Merge pull request #4304 from marcosgdf/bug-4302
...
FIX #4302 Undefined variable $conf in Commande::LibStatut
2015-12-27 17:37:02 +01:00
Marcos García de La Fuente
98351d6fec
FIX #4302 Undefined variable $conf in Commande::LibStatut
2015-12-27 13:15:05 +01:00
Marcos García de La Fuente
67bdfa2617
FIX #4282 Defined shipping time were not shown in Customer order's PDF documents
2015-12-27 13:10:33 +01:00
Laurent Destailleur
5eea1ce7d9
Fix several warnings
2015-12-17 19:37:24 +01:00
Laurent Destailleur
a12e959833
Do not show billed status after order status
2015-11-29 16:33:50 +01:00
Laurent Destailleur
c55d11869b
Billing of supplier or customer order is a process that can be done in
...
parallel with shipment or reception, so we show the status on another
field into lists.
2015-11-29 15:54:32 +01:00
Frédéric FRANCE
47485b39ce
Update commande.class.php
2015-11-19 16:41:11 +01:00
Frédéric FRANCE
6c8ac1e95c
typo
2015-11-19 16:31:55 +01:00
Laurent Destailleur
388748055a
Fix missing translation for VAT
2015-11-15 15:08:54 +01:00
Laurent Destailleur
01058be44c
NEW Introduce a "code" into fiels to describe vat. This will allow to
...
suggest different vat lines with same value with ability to
differentiate them.
2015-11-14 17:53:58 +01:00
Laurent Destailleur
ab177b43af
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
ChangeLog
htdocs/.gitignore
htdocs/comm/mailing/card.php
htdocs/commande/list.php
htdocs/compta/facture.php
htdocs/expedition/class/expedition.class.php
2015-11-13 12:35:10 +01:00
Laurent Destailleur
93be4305c4
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/accountancy/customer/card.php
htdocs/accountancy/customer/list.php
htdocs/accountancy/supplier/card.php
htdocs/accountancy/supplier/list.php
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/fichinter/card.php
htdocs/societe/rib.php
2015-11-13 12:18:46 +01:00
Laurent Destailleur
7a0206adce
FIX Missing to set context into workflow actions, so triggers can't know
...
we are creating an invoice from order or an order from a proposal.
2015-11-08 14:37:50 +01:00
Sergio Sanchis Climent
6b01db5960
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2015-11-06 02:08:55 +01:00
Sergio Sanchis Climent
de8e7107ee
Maintain origin_id and origin for copy document
...
Fix any errors.
2015-11-06 01:53:20 +01:00
Laurent Destailleur
04664c203d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/action/card.php
htdocs/expedition/class/expedition.class.php
htdocs/product/stock/product.php
2015-11-05 22:13:08 +01:00
Laurent Destailleur
58cac2d895
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/comm/action/card.php
htdocs/expedition/class/expedition.class.php
htdocs/product/stock/product.php
2015-11-05 22:09:54 +01:00
Laurent Destailleur
fe78996026
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/product/stock/fiche.php
htdocs/product/stock/valo.php
2015-11-05 22:04:18 +01:00
Laurent Destailleur
5777c16b72
Merge pull request #3902 from altatof/clonedorderdate
...
FIX: change order date on clone (as everywhere else)
2015-11-05 21:49:50 +01:00
Christophe Battarel
80d2445540
FIX: bad stock valorisation
2015-11-05 17:00:22 +01:00
Christophe Battarel
ad82135879
FIX: change order date on clone (as everywhere else)
2015-11-05 15:36:13 +01:00
Sergio Sanchis Climent
f6991dd3ec
Moving new fields at the end
2015-11-04 23:18:28 +01:00
Sergio Sanchis Climent
eba0fa1b96
When you create an "commande" from a "propal" lost $object->origin and $object->origin_id in hook
2015-11-04 22:38:45 +01:00
Laurent Destailleur
a7795f25fc
Fix Must make a difference between a buying/cost price == '' (not
...
provided) and buying/cost price = '0'. We must use default value only if
value is '' and not if forced to '0'.
2015-11-04 17:51:15 +01:00
Laurent Destailleur
da0aa2f937
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
htdocs/langs/en_US/main.lang
htdocs/product/list.php
htdocs/product/stock/mouvement.php
2015-11-02 19:31:42 +01:00
phf
4180862fec
Merge branch '3.8' into fix_3.8_clone_order
2015-10-28 14:36:31 +01:00
phf
f385f8bcfa
FIX better fix to generate a PROV ref after clone
2015-10-28 14:34:34 +01:00
fappels
4d839eea60
Fix #2591 Margin is incorrect used with POS
...
if buy price not defined, define buyprice as configured in margin admin.
If 'Force buying price if null' is off, marge will be equal to suggested
default.(min supplier price or pmp)
Updated all classes reading 'Force buying price if null' setting.
2015-10-26 20:33:42 +01:00
frederic34
865e9d9738
Merge remote branch 'upstream/develop' into patch-15
...
Conflicts:
htdocs/langs/en_US/admin.lang
2015-10-22 10:28:06 +02:00
Laurent Destailleur
0c6441df74
FIX Using extrafield with type "Link to object" works correctly.
2015-10-20 12:40:37 +02:00
Frédéric FRANCE
fe1931bba8
Update commande.class.php
2015-10-19 21:21:27 +02:00
Laurent Destailleur
b3491ef4e5
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/admin/facture_cust_extrafields.php
htdocs/compta/facture/admin/facturedet_cust_extrafields.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/card.php
2015-10-16 10:12:36 +02:00
fmarcet
4cdf17d8b5
FIX #3689 Bug on workflow module
2015-10-15 12:17:57 +02:00
Laurent Destailleur
1f742c7464
FIX Add a test to save life when ref of object (invoice ref, order ref,
...
...) was empty. The was no way to go back to a clean situation, even
after vaidating again the object.
2015-10-06 16:38:27 +02:00
Laurent Destailleur
474bf611ad
FIX product type must be defined before used for vat calculation.
2015-10-03 18:33:46 +02:00
Laurent Destailleur
62792c08eb
Merge pull request #3591 from GPCsolutions/inherited
...
[Qual] Cleanup of inherited class properties
2015-09-26 11:23:59 +02:00
Raphaël Doursenaud
67ddb6c94e
[Qual] Cleanup of inherited class properties
2015-09-24 20:12:55 +02:00
Raphaël Doursenaud
9f2545b95d
[Qual] Replaced deprecated dol_clone by native clone
2015-09-24 17:24:40 +02:00
phf
b222800012
FIX clone customer order create new order with validate ref and not with PROV
2015-09-23 15:14:08 +02:00
Laurent Destailleur
36632593c0
Fix SQL injections #3300
2015-09-12 11:36:19 +02:00
Laurent Destailleur
5bc74ad6ea
Fix SQL injections #3300
2015-09-12 11:23:44 +02:00
Marcos García de La Fuente
9ce8024f1e
Merge remote-tracking branch 'upstream/develop' into refactor
2015-09-06 18:57:38 +02:00
Marcos García de La Fuente
3fbab48d81
Created Commande::hasDelay function
2015-09-05 10:42:54 +02:00
Laurent Destailleur
fc8a822f1d
Merge remote-tracking branch 'origin/3.7' into develop
2015-08-13 04:03:23 +02:00
Laurent Destailleur
c73fe965d2
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
2015-08-13 03:58:32 +02:00
Laurent Destailleur
1595765ec8
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2015-08-13 03:18:02 +02:00
Laurent Destailleur
4b51fc80a6
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
...
Conflicts:
ChangeLog
2015-08-13 00:06:27 +02:00
Marcos García de La Fuente
7cb564586e
Fix: [ bug #3310 ] OrderLine::fetch, FactureLigne::fetch and PropaleLigne::fetch do not return anything
...
Close #3310
2015-08-09 13:52:02 +02:00
Marcos García de La Fuente
4649cf7210
Fix: [ bug #3206 ] PropaleLigne, OrderLine and FactureLigne given to triggers through update function does not contain all the information
...
Close #3206
2015-07-18 19:40:48 +02:00
Laurent Destailleur
43ed48896a
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
build/debian/changelog
htdocs/filefunc.inc.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2015-06-05 18:31:53 +02:00
Gauthier
cf4308aa3b
FIX : When we automatically creta an order from a proposal with workflow module, if some extrafields of propal don't exist in order object, insertExtraFields() function tries to insert extrafields in unexistant column of commande_extrafields table.
2015-06-01 11:24:30 +02:00
Raphaël Doursenaud
3f9270ea78
Qual: added deprecation hinting
...
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
2015-06-01 11:00:11 +02:00
Juanjo Menent
97ad7ca88b
Code fixes
2015-05-09 14:23:26 +02:00
Laurent Destailleur
a93ba86ce0
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/expedition/modules_expedition.php
htdocs/core/modules/modContrat.class.php
htdocs/expedition/class/expedition.class.php
2015-05-07 13:35:09 +02:00
Laurent Destailleur
971e23e006
Fix special_code was lost when updating line
2015-05-07 12:10:27 +02:00
Laurent Destailleur
b71e5a1025
Merge pull request #2673 from aternatik/fix_getentity
...
Fix : missing getEntity calls
2015-05-07 00:48:19 +02:00
jfefe
7e0357dcf9
FIX : remove deprecated property 'libelle' on product object
2015-05-04 03:03:24 +02:00
Frédéric FRANCE
e3f980e32c
Typo
2015-05-01 18:44:27 +02:00
Laurent Destailleur
96a33bbe8a
First clean of code after devcamp
2015-04-21 15:49:58 +02:00
jfefe
f5db4d5bb7
Fix: missing getEntity function
2015-04-19 03:05:37 +02:00
Marcos García de La Fuente
87f97ed545
Merge branch 'develop' into units
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/admin/product.php
htdocs/product/card.php
2015-04-18 23:38:14 +02:00
Marcos García de La Fuente
dc790ff586
NEW: Feature request: A page to merge two thirdparties into one #2613
2015-04-18 20:41:09 +02:00
Laurent Destailleur
56a14da5d4
FIXME that are not bug are replaced with TODO
...
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
2015-04-12 04:01:28 +02:00
Laurent Destailleur
e2508287bd
Merge pull request #2537 from marcosgdf/cq
...
Created Propal, FactureFourniseur, and Commande constants for status
2015-04-06 12:37:52 +02:00
Marcos García de La Fuente
7075ac74c4
Merge branch 'develop' into units
...
Conflicts:
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/card.php
htdocs/contrat/class/contrat.class.php
htdocs/core/class/commonobjectline.class.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/class/product.class.php
2015-04-03 15:45:54 +02:00
Laurent Destailleur
f38bf5a7d2
Fix extrafields were not saved when creating a supplier order
...
Fix removed hooks where we must use trigger
2015-04-03 11:00:52 +02:00
Marcos García de La Fuente
6fe803cd86
Created Propal, FactureFourniseur, and Commande constants for status
2015-04-03 05:18:47 +02:00
Laurent Destailleur
8e9c1c4747
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/commande/list.php
htdocs/core/class/notify.class.php
htdocs/core/login/functions_dolibarr.php
htdocs/exports/export.php
htdocs/langs/en_US/admin.lang
2015-04-01 16:33:39 +02:00
Laurent Destailleur
16a620f926
Fix: Deadlock situation (when order were canceled, no way to make
...
nothing on it)
Fix: Don't know how I forgot this events into trigger system.
2015-04-01 16:07:22 +02:00
Laurent Destailleur
293495467f
Fix: Bad ref used into notification message
2015-04-01 11:30:48 +02:00
Marcos García de La Fuente
1b7ffd80f1
Typo
2015-03-30 03:19:20 +02:00
Marcos García de La Fuente
cc1d298f29
Merge branch 'develop' into constants
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture/class/facture.class.php
2015-03-30 02:36:46 +02:00
Marcos García de La Fuente
3d50b41b8e
Reverted $rowid instead of $id property
2015-03-23 01:40:33 +01:00
Marcos García de La Fuente
4349f27299
Revert "Revert "Refactor 1""
2015-03-23 01:39:12 +01:00
Laurent Destailleur
2d90256640
Revert "Refactor 1"
2015-03-22 12:51:29 +01:00
Laurent Destailleur
a79a779b04
Merge pull request #2456 from marcosgdf/refactor-1
...
Refactor 1
2015-03-22 12:47:05 +01:00
Laurent Destailleur
435be30047
Clean code
2015-03-17 00:35:17 +01:00
Laurent Destailleur
c65f1aea82
Merge pull request #2458 from mrsof/patch-2
...
FIX : Force ref
2015-03-17 00:23:39 +01:00
Laurent Destailleur
6d7b340cee
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/class/dolgraph.class.php
htdocs/langs/en_AU/main.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/fr_FR/other.lang
2015-03-16 18:30:30 +01:00
Sof
88d9f7f0f1
FIX : Force ref
...
Even if you set ref in object class Commande, ref will be set to '(PROVid)' until you call 'valid' function
2015-03-16 12:23:25 +01:00
Marcos García de La Fuente
086e439543
Merge branch 'develop' into refactor-1
...
Conflicts:
htdocs/core/tpl/objectline_view.tpl.php
2015-03-15 18:16:55 +01:00
Marcos García de La Fuente
efb9f7f4fd
Merge branch 'develop' into refactor-1
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/includes/tcpdi/fpdf_tpl.php
2015-03-15 18:07:30 +01:00
Marcos García de La Fuente
094538c07b
Implemented constants in Commande, Facture and Propal
2015-03-15 11:48:57 +01:00
Juanjo Menent
a63b1cf4c3
Fix: Showing system error if not enough stock of product into orders
...
creation with lines
Conflicts:
htdocs/commande/class/commande.class.php
2015-03-14 09:57:28 +01:00
Juanjo Menent
4ae1106ffb
Fix: Showing system error if not enough stock of product into orders
...
creation with lines
Conflicts:
htdocs/commande/class/commande.class.php
2015-03-14 09:50:38 +01:00
Juanjo Menent
7cab558ed2
Fix: Showing system error if not enough stock of product into orders
...
creation with lines
2015-03-14 09:44:58 +01:00
Laurent Destailleur
7b7b5090c7
Merge branch 'incoterm' of https://github.com/atm-ph/dolibarr into
...
atm-ph-incoterm
Conflicts:
htdocs/comm/propal.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-04 23:03:29 +01:00
Marcos García de La Fuente
6ec8a38e4a
Removed duplicated code
2015-03-04 10:46:39 +01:00
Marcos García de La Fuente
54b6b199c7
Documented missing properties and removed redundant documentation
...
(cherry picked from commit 6124f6a )
2015-03-04 10:37:48 +01:00
Marcos García de La Fuente
e1982c54d9
Moved duplicated code to common class
2015-03-04 10:37:47 +01:00
Marcos García de La Fuente
4c08d34bb5
Standardized $rowid as property
2015-03-04 10:37:46 +01:00
Marcos García de La Fuente
b4c84fac9d
NEW: [ task #977 ] New option to manage product unit
...
Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
2015-03-01 12:42:38 +01:00
Laurent Destailleur
8e26c71fa7
Rewrite code for supplier order and invoice to use shared code of
...
customer supplier and invoice.
Work on extrafield for supplier order and invoice.
2015-02-28 04:59:27 +01:00
Laurent Destailleur
ef14e4e7ed
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/fourn/class/fournisseur.product.class.php
2015-02-28 03:11:15 +01:00
Laurent Destailleur
daabc113a5
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
README.md
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/cashjournal.php
2015-02-26 13:36:07 +01:00
Laurent Destailleur
fe7889e266
Fix trigger to insert lines where called when inserting line but also
...
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
2015-02-26 13:19:19 +01:00
Laurent Destailleur
41a74c62e2
Fix trigger to insert lines where called when inserting line but also
...
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
2015-02-26 13:03:17 +01:00
phf
52441914de
Vas avec le merge précédent
2015-02-23 10:42:34 +01:00
phf
127868899d
Merge branch 'develop' into incoterm
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-02-23 10:42:01 +01:00
Laurent Destailleur
e3713c8b6d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/admin/tools/eaccelerator.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/dispatch.php
2015-02-19 00:01:26 +01:00
Marcos García de La Fuente
fa55c60c35
Renamed WorkBoardResponse to WorkboardResponse
2015-02-16 23:52:49 +01:00
Marcos García de La Fuente
d5fd20e911
Renamed BoardResponse to WorkBoardResponse
2015-02-15 15:10:51 +01:00
Marcos García de La Fuente
bab0163c44
Missing Copyright info
2015-02-15 15:07:24 +01:00
Marcos García de La Fuente
d1f73499e9
Refactored dashboard indicator
2015-02-15 15:01:28 +01:00
Marcos García de La Fuente
0d6d98b395
PHPDoc and misc fixes for several folders
2015-02-10 13:17:37 +01:00
phf
24a970a109
[CORE] ajout de la gestion incoterm sur les pages commande et à l'objet (#incoterm).
2015-02-10 12:22:07 +01:00
frederic34
b850b7b448
Merge remote branch 'upstream/develop' into tooltip
...
Conflicts:
htdocs/langs/en_US/sendings.lang
2015-01-30 16:45:24 +01:00
frederic34
736bee565c
Tooltip everywhere
2015-01-30 16:40:33 +01:00
Laurent Destailleur
b61c475aa8
Clean code for validate permissions. "validate" is a status to say, "now
...
it exists, it is no more a draft", so by default we don't need this
permissions (it is same than create). We keep "validate" permissions as
an "advanced" permission only.
2015-01-25 21:32:40 +01:00
frederic34
e18577aa62
Tooltip and lib for file cache
2015-01-24 21:46:05 +01:00
frederic34
f4161b457b
Add dol_escape_htmltag and start to adapt boxes
2015-01-22 00:23:55 +01:00
frederic34
1b0dd671b3
Add tooltip in getNomUrl link
2015-01-20 21:40:33 +01:00
Laurent Destailleur
e220ce5a82
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/card.php
htdocs/comm/propal.php
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/html.formcompany.class.php
htdocs/custom/.gitignore
htdocs/expedition/card.php
htdocs/fourn/card.php
htdocs/product/fournisseurs.php
2015-01-18 18:44:22 +01:00
Laurent Destailleur
5c5ff72ecd
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/adherents/fiche.php
htdocs/comm/fiche.php
htdocs/comm/mailing/fiche.php
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/paiement.php
htdocs/core/class/html.formcompany.class.php
htdocs/core/tpl/login.tpl.php
htdocs/expedition/fiche.php
htdocs/fourn/commande/fiche.php
htdocs/fourn/facture/fiche.php
htdocs/fourn/facture/paiement.php
htdocs/fourn/fiche.php
htdocs/main.inc.php
htdocs/product/fournisseurs.php
htdocs/resource/card.php
2015-01-18 17:13:42 +01:00
Marcos García de La Fuente
41e01a22a3
Fixed loading of external numeration modules in Contrat, Commande, Facture, Contrat, Expedition, Fichinter, CommandeFournisseur and uniformized code
2015-01-17 18:58:05 +01:00
Laurent Destailleur
be4c5cf9d3
Merge remote-tracking branch 'origin/3.7' into develop
2015-01-10 01:16:31 +01:00
Laurent Destailleur
30d1284379
Fixed: Missing ref_ext
2015-01-10 01:15:39 +01:00
Laurent Destailleur
cd2a9d0e09
Merge remote-tracking branch 'origin/3.7' into develop
2015-01-10 01:07:55 +01:00
Laurent Destailleur
87f70f2d22
Fixed: property must be called billed into web service.
...
Fixed: web service to create order was useless. it was not possible to
change status.
2015-01-10 01:07:18 +01:00
Laurent Destailleur
fc78d632d3
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/company.lib.php
htdocs/core/lib/functions.lib.php
htdocs/main.inc.php
2015-01-09 23:09:10 +01:00
Laurent Destailleur
dbcaeb01c0
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/commande/class/commande.class.php
htdocs/filefunc.inc.php
2015-01-09 22:40:45 +01:00
Laurent Destailleur
068ae7f0d4
- Fix: ref_ext was not saved when recording a customer order from web
...
service
2015-01-09 22:32:00 +01:00
frederic34
60661ae948
Add some "classfortooltip"
2015-01-09 00:07:54 +01:00
Marcos García de La Fuente
1f00794c98
Fixed bug which didn't show documents in auto GED when an object had '/' in its ref
2014-12-25 21:47:39 +01:00
Laurent Destailleur
df9a6dae6c
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/fichinter/fiche.php
2014-11-28 02:20:01 +01:00
Francis Appels
b1a4b8e7d0
Fix: [ bug #1624 ] POS set buy price for margin
...
Use lowest buying price for margin when selling with POS or external
module. A POS user does not worry about suppliers.
2014-11-25 21:20:13 +01:00
Laurent Destailleur
d8767bfbae
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/product/class/product.class.php
2014-11-22 16:10:14 +01:00
Laurent Destailleur
9aab62ab36
Merge remote-tracking branch 'origin/3.5' into 3.6
2014-11-22 16:03:09 +01:00
Laurent Destailleur
c186f13218
Fix: Param $action was not defined.
...
A better fix must be done later be removing useless hooks that are
duplicate with triggers.
2014-11-15 19:04:21 +01:00
Christophe Battarel
7ed496d7d9
FIX: copy extrafields when creating order from propale and creating
...
invoice from order
2014-11-12 17:51:26 +01:00
Laurent Destailleur
6f77dc83c4
Qual: Uniformize code and fix a ton of bugs.
2014-10-27 03:24:45 +01:00
Laurent Destailleur
4a60d57544
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/core/lib/security.lib.php
htdocs/product/fiche.php
htdocs/product/liste.php
2014-10-18 21:08:09 +02:00
Laurent Destailleur
9768550696
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
htdocs/categories/fiche.php
htdocs/comm/action/index.php
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/fourn/fiche.php
htdocs/product/composition/fiche.php
htdocs/product/price.php
htdocs/projet/tasks/task.php
htdocs/projet/tasks/time.php
2014-10-12 02:54:34 +02:00
Drosis Nikos
0c7cabbf37
Fix Error when trying to clone an Order
2014-10-06 16:15:11 +03:00
Laurent Destailleur
d518278166
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/fiche.php
htdocs/compta/facture/class/facture.class.php
2014-10-03 19:17:28 +02:00
Christophe Battarel
d1868b643e
FIX: clone line extrafields value on quote, order and invoice
2014-09-24 11:47:34 +02:00
Laurent Destailleur
dc96e10215
Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into
...
marcosgdf-oop-pdf
Conflicts:
htdocs/projet/class/project.class.php
2014-09-23 00:02:19 +02:00
Marcos García de La Fuente
bf7f4c1cab
Refactored generateDocument functions
2014-09-21 18:16:14 +02:00
aspangaro
0b20369dd7
Qual: Renamed all files & links "fiche.php" into "card.php"
2014-09-18 21:18:25 +02:00
Marcos García de La Fuente
e71dc6bc32
Created a method generateDocument for several classes
...
Which are: Commande, Contrat, Livraison, Facture, Projet, Propal, Task, Expedition, CommandeFournisseur, FactureFournisseur and therefore deprecated the following methods supplier_order_pdf_create, supplier_invoice_pdf_create, delivery_order_pdf_create, task_pdf_create, propale_pdf_create, project_pdf_create, facture_pdf_create, expedition_pdf_create, commande_pdf_create
2014-09-16 12:30:37 +02:00
Laurent Destailleur
38233ca05d
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/admin/limits.php
htdocs/commande/class/commande.class.php
htdocs/compta/facture.php
htdocs/core/ajax/ziptown.php
2014-09-02 13:46:47 +02:00
Laurent Destailleur
e82e26c6fa
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
ChangeLog
htdocs/compta/facture.php
htdocs/core/js/lib_head.js
2014-09-02 12:57:33 +02:00
Laurent Destailleur
ee65e42b1c
The "final ref" of an object must be set only once all database actions
...
are ok. So after trigger call.
If a trigger need to know new information on an object, trigger must
make a fetch on object.
Revert "Fix: define new ref before trigger"
This reverts commit cb2b6e6e40 .
2014-08-19 14:57:01 +02:00
Laurent Destailleur
a220634d30
Revert "Fix: define new ref before trigger"
...
This reverts commit 6ab41766c8 .
2014-08-19 14:53:30 +02:00
Regis Houssin
6ab41766c8
Fix: define new ref before trigger
2014-08-18 20:34:55 +02:00
Regis Houssin
cb2b6e6e40
Fix: define new ref before trigger
2014-08-18 20:28:58 +02:00
Regis Houssin
9fdfc740de
Fix: define new ref before trigger
2014-08-18 20:25:57 +02:00
Laurent Destailleur
bb8ec0c8f9
Fix: Too many parameter
2014-08-01 14:26:13 +02:00
frederic34
5258c522ce
Some cleaning
2014-07-25 23:20:19 +02:00
frederic34
2df2c12cfd
The delivery method is transmited in shipment
2014-07-25 21:50:21 +02:00
frederic34
4fcff3e2e5
Select delivery method for order
2014-07-25 17:20:42 +02:00
KreizIT
8e64ea274d
Refactor: ORDER_* and LINEORDER_* trigger
2014-07-11 14:02:21 +02:00
frederic34
f29eeceb1a
Select bank account for propal and order
2014-07-06 20:49:34 +02:00
Laurent Destailleur
be4fe3d0d0
Merge branch 'syslog' of github.com:marcosgdf/dolibarr into
...
marcosgdf-syslog
Conflicts:
htdocs/contrat/class/contrat.class.php
htdocs/fichinter/class/fichinter.class.php
htdocs/projet/class/project.class.php
htdocs/projet/class/task.class.php
2014-07-04 13:43:50 +02:00
Juanjo Menent
1631985d11
[ task #1063 ] Allow edit localtaxes rate for thirds. Works with orders
2014-07-04 11:38:08 +02:00
Marcos García de La Fuente
460fb7a453
Removed new SQL double-debug
2014-07-02 21:29:07 +02:00
Marcos García de La Fuente
7e1cf124b8
Merge branch 'develop' into syslog
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/product/class/product.class.php
htdocs/product/stock/lib/replenishment.lib.php
htdocs/societe/soc.php
2014-07-02 21:20:02 +02:00
Laurent Destailleur
79dec7ad90
Merge pull request #1641 from defrance69/patch-17
...
Patch 17
2014-06-26 21:43:45 +02:00
Laurent Destailleur
018e1d31e3
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/class/commande.class.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/product/class/product.class.php
htdocs/projet/class/project.class.php
2014-06-25 20:22:25 +02:00
Laurent Destailleur
1e6e5da925
Fix: sql syntax error (missing ' on date)
2014-06-25 20:07:54 +02:00
Laurent Destailleur
018771c0f5
Fix: sql syntax error (missing ' on date)
2014-06-25 20:07:21 +02:00
Laurent Destailleur
54f55cf03e
Fix: No change if error on trigger
2014-06-24 22:14:45 +02:00
Laurent Destailleur
8d1fdec8cf
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
htdocs/core/modules/modProduct.class.php
htdocs/fourn/commande/fiche.php
htdocs/projet/fiche.php
2014-06-20 15:26:02 +02:00
Laurent Destailleur
cf948065f4
Fixes for bug 1449, 1450 and 1451 #1654
2014-06-14 12:30:48 +02:00
Marcos García de La Fuente
56abf1cd72
Removed duplicated SQL error logging
2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
88cd5dec40
More substitutions
2014-06-13 01:42:00 +02:00
Marcos García de La Fuente
7e7958cf73
Removed SQL errors as they are logged by the database handler
2014-06-12 13:49:05 +02:00
Marcos García de La Fuente
9fbd7806f0
More substitutions
2014-06-12 11:31:53 +02:00
BENKE Charles
06690431f2
Update commande.class.php
...
research additionnal models numbering in additional modules folders
2014-06-06 12:26:05 +02:00
Laurent Destailleur
ccca46f380
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/comm/propal/list.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/lib/functions.lib.php
htdocs/expedition/note.php
htdocs/fourn/commande/liste.php
htdocs/fourn/facture/fiche.php
htdocs/main.inc.php
htdocs/projet/tasks/index.php
htdocs/theme/eldy/style.css.php
2014-05-29 19:20:48 +02:00
Philippe Grand
7acecadc79
avoid warning in commande.class.php if extrafields is used
...
avoid warning in commande.class.php if extrafields is used
2014-05-23 11:37:57 +02:00
Laurent Destailleur
b7f55ea99c
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/modules/modAgenda.class.php
htdocs/core/modules/modProduct.class.php
htdocs/fourn/commande/liste.php
2014-05-18 11:52:52 +02:00
Alexis Algoud
fa212438c6
FIX alert for customer order wasn't on delivery_date if exist
2014-05-14 18:51:02 +02:00
Laurent Destailleur
f621f7eb32
Fix: The rounding mode is now forced when provided explicitly and no
...
more by default (we keep data intact when no mode provided).
2014-05-13 13:22:29 +02:00
Laurent Destailleur
69eaefc459
Fix: The way we tested if a ref/id already exists was wrong. Introduce a
...
common static method for this. Removed verifNumRef method.
Fix: Add missing logs
2014-05-13 10:12:45 +02:00
Raphaël Doursenaud
f8f502d013
Removed closing php tag
...
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Laurent Destailleur
ad23c88f1a
Merge pull request #1481 from atm-maxime/mko672
...
Add : Stock can be mandatory to use a product
2014-03-15 17:29:31 +01:00
Maxime Kohlhaas
1911f6fcdc
Task 672 : add stock limitation on shipment + translation
2014-03-15 14:59:27 +01:00
Maxime Kohlhaas
b6a2fa61c8
Task 672 : only for product not services
2014-03-15 12:47:01 +01:00
Maxime Kohlhaas
9c340d7af8
Task 672 : Prevent use of product not available
2014-03-15 12:45:56 +01:00
Maxime Kohlhaas
67342486a6
Task 1074 : add link to source document on stock movement
2014-03-15 02:18:39 +01:00
Laurent Destailleur
9e5e74cb58
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/fourn/commande/fiche.php
htdocs/langs/es_ES/admin.lang
htdocs/langs/es_ES/languages.lang
htdocs/langs/es_ES/main.lang
2013-12-19 21:03:15 +01:00
Laurent Destailleur
ca36a4dd97
Merge pull request #1348 from atm-alexis/3.5
...
Improper use of delete() function and ldap with multientity bug corrections
2013-12-16 05:26:31 -08:00
Laurent Destailleur
6946fdbcda
Merge remote-tracking branch 'origin/3.5' into develop
2013-12-16 00:09:29 +01:00
Laurent Destailleur
7864fe3cfd
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/core/tpl/objectline_edit.tpl.php
2013-12-16 00:07:50 +01:00
Laurent Destailleur
6e9b8dc77a
Fix: Missing special code
2013-12-15 21:10:39 +01:00
Alexis Algoud
895f5452b4
In some cases of improper use of the delete () function, the complete repertoire of propale objects, invoice or order was deleted.
...
Ex in agefodd module:
$obj_link=new Propal($db);
$obj_link->id=$agf->propalid;
$resultdel=$obj_link->delete($user);
To prevent misuse of the function, the reference is not considered given
2013-12-11 15:14:29 +01:00
Francis Appels
6b6a519afd
fix sql error create commande
...
While testing on an azure website I encountered a sql error on create
commande.
azure uses cleardb with mysql version 5.5.21-log
2013-12-10 23:10:42 +01:00
Laurent Destailleur
0e743d5024
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/adherents/admin/adherent.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/document.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/facture/list.php
htdocs/cron/card.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/commande/document.php
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/cron.lang
htdocs/langs/fr_FR/projects.lang
htdocs/langs/nl_NL/admin.lang
htdocs/langs/nl_NL/categories.lang
htdocs/langs/nl_NL/commercial.lang
htdocs/langs/nl_NL/companies.lang
htdocs/langs/nl_NL/dict.lang
htdocs/langs/nl_NL/main.lang
htdocs/langs/nl_NL/margins.lang
htdocs/langs/nl_NL/products.lang
htdocs/societe/class/societe.class.php
htdocs/societe/rib.php
2013-11-19 21:08:02 +01:00
Grand Philippe
c5f29e14a4
missing trad and fix language
2013-11-02 17:50:24 +01:00
Laurent Destailleur
949b8c6274
Mark method classer_facturee deprecated.
...
Make better translation of some workflow options.
2013-09-16 11:50:53 +02:00
simnandez
b36dc08e00
Remove unnecessary code
2013-09-12 09:59:23 +02:00
Laurent Destailleur
92e1536d8f
Fix: checkstyle errors
2013-09-11 09:56:20 +02:00
simnandez
bc0356db1f
[ task #1060 ] Register fields localtax(1|2)_type into details tables
2013-09-10 18:32:03 +02:00
simnandez
af89a794a0
Fix: [ bug #1061 ] Bad info shipped products
2013-09-10 11:06:15 +02:00
simnandez
43beb38c9b
Fix: [ bug #1061 ] Bad info shipped products
2013-09-10 11:04:36 +02:00
Laurent Destailleur
2c0a01fc8c
Merge remote-tracking branch 'origin/3.4' into develop
2013-07-11 17:57:06 +02:00
Laurent Destailleur
27a435994a
Qual: Some methods object->addline used a first parameter that was
...
object->id, some not. Of course this was not a good pratice, since
object->id is already known so no need to provide it as parameter.
All methods addline in this case were modified to match good
pratice and be uniformed with others.
2013-07-10 17:29:54 +02:00
Florian Henry
729cef3eb4
Qual: Return id of order creates instead of 1 with method
...
createFromProposal
2013-07-10 13:32:42 +02:00
Florian Henry
b9bfccd0e2
fix pgsql warning date
2013-07-10 10:35:10 +02:00
Florian Henry
4aa966f7ad
remove pgsql warning on date insert
2013-07-10 10:30:33 +02:00
Laurent Destailleur
7c163f7be3
Fix: Running fixdosfile onto all project
2013-07-07 13:17:48 +02:00
Laurent Destailleur
7b5e0678db
New: Make some changes to allow usage of alternative
...
$dolibarr_main_url_root variables.
Can now use several alternative path. Fix several bugs with all code.
2013-07-07 03:26:51 +02:00
Regis Houssin
05bd035488
Fix: convert line delimiters
2013-06-24 17:34:22 +02:00
Laurent Destailleur
c748f3d834
Qual: Removed useless methods
...
Qual: Removed deprecated vars
Qual: Free memory
2013-06-16 21:31:21 +02:00
Florian Henry
9f03074127
- New: [ task #926 ] Add extrafield feature on order lines
...
- New: [ task #927 ] Add extrafield feature on Proposal lines
- New: [ task #928 ] Add extrafield feature on invoice lines
2013-06-10 16:05:41 +02:00
Regis Houssin
c9a71439b2
Fix: EOF
2013-06-05 16:24:32 +02:00
fhenry
cb182752cc
Report divert bug fixing from 3.4
2013-05-19 18:47:14 +02:00
fhenry
fefb21a56e
Fix bug on Extrafield checkbox
...
Fix bug on ActionComm Update
[ task #900 ] Review code of ficheinter.class.php
2013-05-18 12:17:43 +02:00
Laurent Destailleur
e29f533b7a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/comm/propal/class/propal.class.php
2013-04-27 15:15:31 +02:00
Laurent Destailleur
52952c6fce
Uniformize code for liste_array
...
Fix visibility of elements into product page (manage external users)
2013-04-27 15:08:35 +02:00
fhenry
5dce16863f
Review delete extrafield in delete class method
2013-04-26 17:20:21 +02:00
fhenry
5d8e541292
Fetch_optionals into fetch commande
2013-04-26 16:51:01 +02:00
Laurent Destailleur
36b314a2d6
Try to solve some problems with table (replaced by div).
2013-04-25 20:27:45 +02:00
fhenry
24a6321d45
Fix : Add service date limit transfert from propal to order
2013-04-15 15:55:10 +02:00
Laurent Destailleur
ba93a4bfe2
Fix: Codesniffer
2013-04-10 12:20:45 +02:00
fhenry
275bf67bb7
[ task #811 ] Uniformanize note field
2013-04-09 17:18:07 +02:00
Grand Philippe
ea077e959b
normalize code
2013-04-08 14:57:06 +02:00
fhenry
dfcb38d13f
[ task #793 ] Add extrafield feature into Orders module
2013-04-05 12:43:00 +02:00
Laurent Destailleur
350bcea183
Merge
2013-03-22 17:10:17 +01:00
Grand Philippe
12317d0371
fix trad : change adresse versus address
2013-02-15 19:18:26 +01:00
Regis Houssin
fcee35c65d
Fix: $hookmanager is a global object
2013-01-26 10:35:30 +01:00
Laurent Destailleur
56e11e52fa
New: hookmanager class is used frequently and is a factory object, so we
...
can move it during init of environment and use it globally.
2013-01-25 19:12:54 +01:00
Regis Houssin
e8ce9cecf2
Fix: broken features, special_code also used by externals modules !
2013-01-22 21:36:30 +01:00
Laurent Destailleur
8d206fdfb0
Prepare move to other licence. For the moment all answers for licence
...
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Regis Houssin
b838895db9
Fix: change for a neutral email
2012-12-30 15:13:49 +01:00
Laurent Destailleur
ca2b3f11b1
Fix: Several fix in trigger names
2012-12-30 12:24:53 +01:00
Laurent Destailleur
078b015db8
Work on multitax (vat). Need your test.
...
Qual: Because params were often missing in calculate_price(), params are
now mandatory.
2012-11-03 16:32:49 +01:00
Christophe Battarel
144b08cac1
fix wrong test for product type in order->getNbProductsLines()
...
also add getNbServicesLines() function in order class.
2012-10-25 11:26:36 +02:00
Laurent Destailleur
7385ea15db
Doxygen
2012-10-13 13:03:39 +02:00
Laurent Destailleur
091966902e
Fix: for special_code=3
2012-10-12 22:18:31 +02:00
Maxime Kohlhaas
16f82216bf
Task # 186 : Add stock column in sql request to get object lines + display alert icon if stock is too low
2012-10-04 16:26:33 +02:00
Laurent Destailleur
2617fc21a6
Some fix: List of invoices to show in "to bill" menu must contains
...
"Validated, Shipment in process, Delivered" (some users may want to
make invoice before shipment, some after).
We keep workflow opened by default. Module workflow may restrict this
however.
Also, remove menu entry, because we now have direct link to page onto
list.
2012-10-03 11:43:39 +02:00
Laurent Destailleur
533e285dad
Merge pull request #403 from simnandez/develop
...
Trad: Add ca_ES and es_ES translations
2012-09-19 05:53:43 -07:00
Laurent Destailleur
1347ecf14e
Qual: Removed warnings
2012-09-19 12:49:58 +02:00
simnandez
b7837f9280
Fix: Localtaxes type only missing in propal update line
2012-09-18 18:18:30 +02:00
simnandez
0bf29edb60
Fix: Add type of product/service into commandes for a correct
...
localtaxes calculation
2012-09-18 17:41:59 +02:00
Regis Houssin
43c0a03758
Fix: strict mode tornado
2012-09-15 11:21:22 +02:00
Regis Houssin
be13602c71
Fix: use getDocumentsLink method
2012-09-15 09:02:20 +02:00
simnandez
4ac2ee83f2
Localtaxes also in skip_update_total comprobation
2012-09-12 19:07:23 +02:00
Christophe Battarel
c1859d361a
modify margin management for global discount + correct bug (wrong constant name)
2012-08-28 10:13:58 +02:00
Regis Houssin
995c7f13d3
New: [ task #498 ] part3
2012-08-23 13:45:51 +02:00
Regis Houssin
f4d75e87d3
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git
...
into task498_objectline
Conflicts:
htdocs/core/class/commonobject.class.php
2012-08-23 07:53:48 +02:00
Regis Houssin
c8e1aca7d8
New: [ task #498 ] part2
2012-08-23 07:50:20 +02:00
Marcos García
9b3c89ac47
Removed parenthesis from all include and include_once and replaced with single quotes
2012-08-23 02:40:41 +02:00
Marcos García
706d79986c
Removed parenthesis from all require_once and replaced with single quotes
2012-08-22 23:11:24 +02:00
Laurent Destailleur
068c536741
Fix: Delete all files (PROV* when validating.
2012-08-07 14:24:54 +02:00
Laurent Destailleur
76cdb809cc
Fix: syntax error
2012-08-05 21:30:40 +02:00
Regis Houssin
2e73cd7ddf
Fix: missing fields and compatibility with milestone
2012-08-01 17:38:10 +02:00
Regis Houssin
e44fd4885d
Fix: change the last $DB to $db
2012-07-30 18:43:49 +02:00
Marcos García
5a73c32f46
Migrated ClassName to __construct() function
...
Changed $DB to $db
lower-cased "Class"
2012-07-30 17:17:33 +02:00
Laurent Destailleur
d6a5b224fb
Revert bad practice: setEvent use SESSION. Such usage is limited to HTML
...
page context and can be used inside any pages.
However usage of _SESSION must never be used inside a library (except
for function dedicated to HTML page context), and never inside
object classes (we must use $this->errors, $this->mesgs or
$this->warnings instead).
2012-07-29 14:15:29 +02:00
Regis Houssin
eee5653c54
Fix: try to use the new message system
2012-07-29 12:54:19 +02:00
Regis Houssin
1dd14d35f7
Fix: add null value in class method
2012-07-28 18:32:54 +02:00
Laurent Destailleur
ea93e62e91
Fix: Checkstyle
2012-07-23 10:46:09 +02:00
Marcos García
e6a192ba87
Renamed fk_demand_reason to fk_input_reason
2012-07-22 16:53:02 +02:00
Regis Houssin
fafd79a0f8
Fix: uniformize code (in progress)
2012-07-20 09:57:50 +02:00
Christophe Battarel
c8e211c864
add missing include
2012-07-19 10:48:01 +02:00
Christophe Battarel
d32091120b
margin management for orders
2012-07-19 10:26:26 +02:00
Laurent Destailleur
73b17dc4c5
New: Make things more clear.
2012-07-17 15:28:34 +02:00
Regis Houssin
e1b0d183e4
Fix: add commonorder and commoninvoice classes
2012-07-11 18:13:41 +02:00
Regis Houssin
d1e80afe62
Fix: move "classify billed propal with order" in workflow manager
2012-07-08 13:19:13 +02:00
Regis Houssin
69ebda8ddb
Fix: regression corrected
2012-07-08 12:18:29 +02:00
Regis Houssin
3bfd9182e0
Fix: uniformize code
2012-07-06 13:43:59 +02:00
Regis Houssin
6f1651309e
Fix: global converting lines delimiter
2012-07-02 19:30:37 +02:00
Regis Houssin
bf379fc242
Fix: uniformize code
2012-06-11 21:45:59 +02:00
Regis Houssin
513e3b8ae7
Fix: remove deprecated code can cause warning
2012-06-08 18:18:59 +02:00
Regis Houssin
b5246add8d
Fix: big problem with files upload and more compatible with external
...
modules
2012-05-30 00:07:06 +02:00
Laurent Destailleur
a3216ee0c6
Fix: Checkstyle
2012-05-09 02:39:30 +02:00
Laurent Destailleur
05c015836a
Fix: filter on status
2012-05-03 22:58:12 +02:00
Laurent Destailleur
fbab99b28e
Fix: [ bug #378 ] status for order i, process is "waiting for reception"
2012-05-01 15:08:54 +02:00
Regis Houssin
e49df57667
Fix: compatibility with php 5.4 and E_STRICT mode
2012-04-14 15:04:46 +02:00
Regis Houssin
ffc6812241
Fix: avoid php strict mode warning
2012-03-23 18:19:50 +01:00
Laurent Destailleur
4690944216
checkstyle
2012-03-20 12:46:57 +01:00
Regis Houssin
4ecc64504d
Fix: use the original json functions
2012-03-18 19:59:38 +01:00
Laurent Destailleur
ed41e03589
Qual: Fix a ton of CheckStyle errors
2012-03-18 19:23:01 +01:00
Regis Houssin
391ce8490f
New: add "extraparams" field for stock extra parameters with json
2012-03-16 14:32:37 +01:00
Regis Houssin
dae20441d0
Fix: add template for view/edit notes in object card and add possibility
...
to show/hide this bloc
2012-03-16 09:39:32 +01:00
Regis Houssin
e86fed02fc
Fix: missing linked objects
2012-03-15 07:23:49 +01:00
Regis Houssin
5fbd8e4cee
Fix: move method in common class
2012-03-14 11:11:46 +01:00
Regis Houssin
4d1416d0e6
Fix: remove unused and deprecated method
2012-03-13 20:15:13 +01:00
Regis Houssin
f8bf7ade83
Fix: move method in common class
2012-03-13 20:01:10 +01:00
Regis Houssin
150f3ecfe3
Fix: move method in common class
2012-03-13 19:24:11 +01:00
Regis Houssin
5e402f667e
Fix: php unit test warning
2012-03-04 10:13:52 +01:00
Regis Houssin
9301def08d
Fix: rename method
2012-03-02 15:03:14 +01:00
Regis Houssin
ea83e474dc
New: add possibility to linked other objects from external modules
2012-02-22 01:19:05 +08:00
Regis Houssin
c3e245d24e
Fix: start triggers before delete objects
2012-02-15 15:16:33 +01:00
Regis Houssin
6f3f1204fe
Fix: delete linked object in propal delete function and uniformize code
2012-02-13 18:27:42 +01:00
Regis Houssin
cd3452d71d
Fix: multicompany sharings and uniformize code
2012-02-11 10:18:09 +01:00
Laurent Destailleur
186258410e
New: Add option to clean orphelins files into repair page
2012-02-08 16:41:06 +01:00
Regis Houssin
6a43a517f1
Fix: add deleteObjectLinked function
2012-02-07 16:47:46 +01:00
Laurent Destailleur
6cb0685b6f
Qual: Uniformize hook names. All hooks to add information on
...
create/update/view cards are called fomrObjectOptions instead of
sometine formObjectOptions, sometimes showInputFields, sometimes
showOutputFields.
2012-02-06 17:18:19 +01:00
Juanjo Menent
83bef28418
Qual: Uniformize code
2011-12-16 12:47:23 +01:00
Regis Houssin
a5fc434770
Fix: remove unused parameters
...
Fix: use dol_clone instead fetch
2011-12-12 14:04:03 +01:00
Laurent Destailleur
ebea7f6c97
Fix: fix not initialized variables
2011-12-05 18:36:54 +01:00
Laurent Destailleur
1770a46519
Qual: Removed tons of warning
2011-11-22 14:00:03 +01:00
Laurent Destailleur
49d1bcf256
Fix: duplicate assignement
2011-11-22 00:36:20 +01:00
Laurent Destailleur
12963265d7
Add confirm message when going back to draft
2011-11-14 16:23:59 +01:00
Laurent Destailleur
7384096d56
Enhance doc for stock movement
2011-11-14 15:46:44 +01:00
Laurent Destailleur
253084feb3
New: Can choose warehouse for invoice validation
2011-11-09 14:31:43 +01:00
Laurent Destailleur
3d0c324f5f
Fix: Message for stock movement was wrong or missing
2011-11-08 00:03:19 +01:00
Laurent Destailleur
8d1284ed42
Choose warehouse for order validation
2011-11-07 15:04:02 +01:00
Laurent Destailleur
fd9e0d8643
Qual: Removed code that must be stored into external modules
2011-11-05 12:34:54 +01:00