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

223 Commits

Author SHA1 Message Date
Laurent Destailleur
32b6766a7d FIX #5195 2016-06-04 01:50:01 +02:00
Laurent Destailleur
a587ba496c NEW Can select fields on supplier orders 2016-05-24 18:43:35 +02:00
Laurent Destailleur
f901453a6b FIX addMoreActionsButtons hook must be inside the div class=tabaction. 2016-05-05 21:38:29 +02:00
Laurent Destailleur
c795803da1 FIX ref_supplier was not set. We also refered to old var names. 2016-05-05 20:19:56 +02:00
Laurent Destailleur
8a8e7cdf5e Merge pull request #4686 from bafbes/abb-10 
New + Fix : handle supplier orders from customer orders with id variable name correction
 2016-05-05 20:07:42 +02:00
Laurent Destailleur
bfc5be1aad FIX Fix and move dolGetFirstLine function into main 
FIX Hang on ->client not defined
 2016-04-22 19:07:32 +02:00
Laurent Destailleur
1de36d6501 Merge pull request #5011 from altatof/supplierorder_noprice 
NEW hidden feature: SUPPLIERORDER_WITH_NOPRICEDEFINED
 2016-04-22 18:27:42 +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
Christophe Battarel
ec5e0e5290 forgot one line 2016-04-15 12:32:36 +02:00
Christophe Battarel
c3d4cd85f1 NEW hidden feature: SUPPLIERORDER_WITH_NOPRICEDEFINED allow supplier 
order even if no supplier price defined
 2016-04-15 12:28:35 +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
04a85ff831 FIX Substitution key on email of supplier order was broken 2016-04-08 16:06:50 +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
7f129d14d7 Better responsive design 2016-04-07 14:08:38 +02:00
Laurent Destailleur
e40b678d7b Uniformize code 2016-04-01 16:29:47 +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
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
Laurent Destailleur
0f9afea1cc Merge pull request #4731 from IonAgorria/unset-date-post 
Fix: unset date start/end at success
 2016-03-04 16:20:10 +01:00
Ion Agorria
a1159b6f29 Fix: unset date start/end at success 2016-03-04 14:11:06 +01:00
Maxime Kohlhaas
db656ea4ca New : add button to create event on supplier order or invoice with MAIN_ADD_EVENT_ON_ELEMENT_CARD 2016-03-04 10:38:33 +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
Bahfir Abbes
4cbc1539b9 Fix: displays error when the supplier price does not exist. 2016-02-26 22:48:01 +01:00
abb
5e2261c9bd handle customer orders from supplier orders with id variable name correction 
Conflicts:
	htdocs/fourn/commande/card.php
 2016-02-26 01:26:16 +01:00
Laurent Destailleur
f6d1913bb7 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2016-02-22 13:35:46 +01:00
Laurent Destailleur
7ba6754a55 Fix the missing button to record reception 2016-02-18 00:27:35 +01:00
phf
e24a35b904 New add multicurrency on supplier proposal/order 2016-02-16 23:58:21 +01:00
Laurent Destailleur
99b2236260 FIX Selection of project must no show closed project 2016-01-28 12:19:13 +01:00
Laurent Destailleur
df4cd3de17 FIX Selection of project must no show closed project 2016-01-28 12:05:14 +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
Laurent Destailleur
dbaa43f3be Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/holiday/card.php
	htdocs/holiday/list.php
	htdocs/user/card.php
 2016-01-23 11:45:39 +01:00
Laurent Destailleur
dc438792f4 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/fourn/commande/card.php
 2016-01-23 11:39:37 +01:00
Regis Houssin
905f9d78ed Fix: $outputlangs is not defined (dolibarr 3.7, 3.8, 3.9) 2016-01-15 13:12:19 +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
Laurent Destailleur
84ee18a11b Fix bad management of second level approvement 2015-12-14 10:33:18 +01:00
Laurent Destailleur
3bcdc5c9c0 Merge pull request #4181 from grandoc/develop 
[Qual] Uniformize code
 2015-12-10 13:35:44 +01:00
philippe grand
01c6728aa9 [Qual] Uniformize code 2015-12-08 11:35:08 +01:00
Ion Agorria
1dc5854535 Fix date handling for hours/mins in some pages 2015-12-07 03:59:03 +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
Alexis Algoud
55b23c4918 FIX add billed field in supplier order 2015-11-16 14:55:46 +01:00
Laurent Destailleur
6bd6be0912 Debug and rename experimental module "supplier proposal". Still work to 
do: Must fix the PDF to be compliant with a request quotation to a
supplier (so no need to show vat, unit price, ...).
 2015-11-15 19:23:39 +01:00
Laurent Destailleur
b2285ca5e0 Option MAIN_EMAIL_ADD_TRACK_ID is now set to 1 by default. 
All emails sent from Dolibarr have a dedicated tracking id.
 2015-11-12 21:25:01 +01:00
frederic34
a597d6c379 allow chaining 2015-11-07 10:23:56 +01:00
frederic34
becce332dd allow chaining and remove header exit 2015-11-07 09:52:00 +01:00
Frédéric FRANCE
ff9648eed9 Update card.php 2015-10-29 19:09:37 +01:00
philippe grand
1762b3aaa7 [Qual] Uniformize code 2015-10-17 17:09:34 +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
Laurent Destailleur
80bd563fde Use GETPOST 2015-10-11 20:41:06 +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
Juanjo Menent
31230d296d Merge remote-tracking branch 'upstream/3.8' into develop 2015-10-03 23:51:38 +02:00
philippe grand
e22fb3c538 fix : Typo 2015-10-02 12:39:09 +02:00
philippe grand
8a9c9f49d5 fix : Typo 2015-10-02 12:37:13 +02:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
Laurent Destailleur
da6a1d6629 NEW Introduce a method getDefaultCreateValueForField for developers to 
get a default value to use for a form in create mode.
Implement it for public and private notes.
 2015-09-22 13:55:31 +02:00
Aurélien Stride
1a3d8b5ae4 FIX : adjusted test for affecting supplier reference 2015-08-31 09:25:39 +02:00
Aurélien Stride
e2072999cf ADD : ref_supplier to object property, otherwise not visibly updated on change 2015-08-28 17:12:27 +02:00
Laurent Destailleur
52240eec9a Fix removed warnings 2015-08-15 02:44:05 +02:00
Laurent Destailleur
fcc6ce8c31 Fix Option for second level approbation was visible when it should 
not.
 2015-07-29 15:39:34 +02:00
Laurent Destailleur
5ca6593a57 Fix serious deadlock feature. It was possible to link with no way to 
unlink. What if user make a bad click ? I complete feature with
reverse action to be sure to not have users with a corrupted situation.
 2015-07-28 14:13:16 +02:00
Laurent Destailleur
1fb40565f4 Fix bad parameters of function select_date 2015-07-12 12:50:24 +02:00
Laurent Destailleur
7ad4d9056d Merge pull request #3117 from All-3kcis/patch-2 
Correct display of hours and minutes after action "Order"
 2015-07-04 04:14:12 +02:00
Laurent Destailleur
5fafb08f91 Uniformize code 2015-07-04 04:11:16 +02:00
All-3kcis
89c870225c Correct display of hours and minutes after action "Order" in supplier order. 2015-06-30 10:49:15 +02:00
Laurent Destailleur
dc050d39eb Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/adherents/type.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/js/lib_batch.js
	htdocs/core/modules/modUser.class.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/card.php
	htdocs/societe/consumption.php
	htdocs/user/info.php
	htdocs/user/note.php
	htdocs/user/param_ihm.php
	htdocs/user/perms.php
 2015-06-29 00:09:28 +02:00
Juanjo Menent
0f046776d5 FIX #3091 TotalHT amount in supplier order is bold unlike the rest of 
Dolibarr
 2015-06-26 17:54:34 +02:00
Regis Houssin
e3d1614004 Fix: ereg more simple 2015-06-11 09:21:44 +02:00
Laurent Destailleur
9b7982bf0c Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/core/class/html.form.class.php
	htdocs/fourn/facture/card.php
	htdocs/theme/eldy/style.css.php
 2015-06-08 18:28:50 +02:00
Laurent Destailleur
02dbe16366 Mutualize code to show block to link an element to another one. 2015-06-06 15:57:59 +02:00
Regis Houssin
9a812a6c28 Fix: add filter for "dol_most_recent_files" for avoid conflict with 
option "Save file on server with name "FA0700034-Original filename""
 2015-06-06 13:03:02 +02:00
Laurent Destailleur
f42065146a Start to clean html.form class. 2015-06-06 12:26:47 +02:00
Laurent Destailleur
03acb1a8c9 Uniformize way to report error after "buildoc" action. 2015-05-19 00:01:30 +02:00
Laurent Destailleur
5937cd7f70 NEW Forms are using the tab look, even in creation mode. 2015-05-13 17:53:25 +02:00
jfefe
7e0357dcf9 FIX : remove deprecated property 'libelle' on product object 2015-05-04 03:03:24 +02:00
Laurent Destailleur
96a33bbe8a First clean of code after devcamp 2015-04-21 15:49:58 +02:00
Marcos García de La Fuente
7be7a770c1 Implemented units for CommandeFournisseur and FactureFournisseur 2015-04-19 16:46:24 +02:00
Florian HENRY
f2018b7946 fix bug #2652 2015-04-18 22:59:20 +02:00
Florian HENRY
b7191a541c All send email card works with model choice box 2015-04-18 17:15:36 +02:00
Laurent Destailleur
d7ef1e7da0 The supplier code was not visible on supplier pdf. 2015-04-13 14:25:27 +02:00
Laurent Destailleur
5dc1102601 Fix object not defined 2015-04-13 13:34:13 +02:00
Laurent Destailleur
dbaaa44c76 Fix: link must not be visible if module disabled 2015-04-13 13:22:12 +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
530650b857 Make module productbatch stable 2015-04-10 11:59:41 +02:00
Laurent Destailleur
e01e0faeef Can reopen to edit supplier order once ordered 2015-04-09 16:15:52 +02:00
Laurent Destailleur
fc803e7000 Fix permission lost when enabled/disabled module. 2015-04-08 17:33:38 +02:00
Laurent Destailleur
b3355df3bf Fix delivery delay could not be set to unknown 2015-04-08 13:00:03 +02:00
Laurent Destailleur
94087f539f Fix style 2015-04-08 11:50:40 +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
Laurent Destailleur
d71a3c52b4 Comments 2015-04-03 00:28:35 +02:00
Laurent Destailleur
e480177d9c Fix error of triggers not reported to user 2015-04-02 18:44:02 +02:00
Laurent Destailleur
d8db32a99c NEW: Introduce option SUPPLIER_ORDER_DOUBLE_APPROVAL to allow 2 
approvals to make a supplier order approved. Activating this option
introduce a new permission to the second level approval.
 2015-04-01 21:00:51 +02:00